Merge "Fixed an issue where notifications could visually overlap" into qt-dev
am: 5894d5b851

Change-Id: I390a31685da652d08143ebc1a8ab46e7e33d5d58