Merge "Don't allow airplane mode to affect location status icon. Gps still...

Merge "Don't allow airplane mode to affect location status icon. Gps still operates when airplane mode is on, and consumes just as much power so the icon shouldn't be hidden." into klp-dev