Merge pull request #11867 from Quick-Flash/smooth-airmode-off-to-on-transition