Merge branch 'issue-4538' into release
fix #4535: GPS disconnects after getting a fix

Google Play services will be turned off by default on Android versions
before ICS.
Merge branch 'issue-4535' into upstream