Merge "handleAirplaneModeToggled cleanup" into jb-dev