Merge "Fixed an issue where the notification wouldn't collapse" into qt-dev am: 8ba52400f5 am: 544bb14ac0
am: 54e8e462b3

Change-Id: Ide62752910bcae24c172ddecbad80ea7b9c91345