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

Change-Id: I4c2f89ff3eb184db98c7bf117b489838f52a30bf