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

Change-Id: I2408d29c07646f836b5bd6be4b762bf848291539