Fix some issues with the settings dialog that were introduced as
a result of merging the fix for #2162.
[YOCTO #3117]
(Bitbake rev: a363f59579e01cb7bd39be2ce73f22c875c62ce7)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>