Merge proposals dependent on lp://qastaging/~seb128/unity-settings-daemon/xsettings-fixes-backport

1. xsettings-fixes-backport
2. Dependent merge proposals