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