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