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

Change-Id: I9906cf30e31c1bd3fa0968f65ffaa1fd33b2ce1b