Merge "Fixed an issue where notifications could visually overlap" into qt-dev