Merge "Support some changes to SettingsLib"