Merge "Fixed an issue where heads up notifications would overlap" into qt-r1-dev am: 5e1a2df834
am: a7d269bc94

Change-Id: I52b7dff1339cb1783b0c87128e0345b041f4a37a