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

Change-Id: I43a1ca32d3d4b3be639b9bd796caab6402b4b39c