Merge "Do not report AOD as showing when fading away" into qt-r1-dev