Merge "Workaround to let SettingsUtils handle empty settings values." into qt-dev am: 2953c8a606
am: 75609899e1

Change-Id: I11019a0a58311b17e42a88522cad227bfadb9c16