Merge "[2/2] Settings: recover last location state during on/off switch" into android-4.4

Change-Id: Ia8263c13999daa0e26516273eb07de32d4d989b4