Merge "Improved the heads up experience when notifications were blocked" into qt-r1-dev