Merge change 5402

* changes:
  Settings: Add preference to enable/disable assisted GPS.