Merge change 6287 into donut

* changes:
  Restore GPS state and ringer/vibrate toggles.