Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode

Apply a few changes that were requested in the PR during the review.

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/Messages.h
#	src/displayapp/screens/settings/Settings.cpp

src/displayapp/screens/BleIcon.h

@@ -7,7 +7,7 @@ namespace Pinetime {
     namespace Screens {
       class BleIcon {
       public:
-        static const char* GetIcon(Pinetime::Controllers::Ble::ConnectStates state);
+        static const char* GetIcon(bool isRadioEnabled, bool isConnected);
       };
     }
   }