Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev