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

Change-Id: I426de06b366e5852bd52f02114ba003512765fa3