Merge "Fixed an issue where heads up notifications would overlap" into qt-r1-dev