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

Change-Id: I0dd741834f125d0358d8d31bde7caaed625a5a83