Merge "Move some app methods to AppUtils in SettingsLib"