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

Change-Id: I9853c734b1269957193a6f82da241f288036c3ea