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

Change-Id: I635e6725083529cf6ae24d29e9c35f388afa379f