Fixes loading of Settings defaults

Closes-Bug: #1276049

Change-Id: Ice785baaa2393681f7c7f28b44caea1e6372d0df
Merge "Fixes loading of Settings defaults"