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

Change-Id: Ib896925030fcf8108061ca06db8f64d90642d146