Bug 856438 - Ensure GPS disappears when unused
Merge branch 'bug856438-gpsfix' into master-local