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