Merge "Use preference theme from SettingsLib"