Merge "Sync lastest SettingsLib interface"