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

Change-Id: I68358e49e5a574018a960317def83c5f192c75aa