Merge "Adds SettingsCompat to mirror settings names used in Launcher" into pi-dev