Merge "Misc fixes in settingslib"