Stock packages_apps_Settings commit