Merge "Fixed an issue where the notification wouldn't collapse" into qt-dev am: 8ba52400f5 am: a4ca52d297 am: 621d2f4fd1
am: d1d4665c4e

Change-Id: I89a94e79970585891eaa5ba8bf82ef63167f05cb