Merge "Merge "Fixed an issue where notifications could visually overlap" into qt-dev am: 5894d5b851 am: 87d0dceecd" into qt-r1-dev-plus-aosp