Merge "Adds SettingsCompat to mirror settings names used in Launcher" into pi-dev am: eb914118f4
am: 3118c5768a

Change-Id: Ic07fbe1dad857591e7443906578e1194dd5a618b