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

Change-Id: Id9ebbd549a80103e235717c9d599ed25fa8033d4