am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi