Merge "Merge "Fix rendering issue after cancelling Notifications inside a group" into tm-qpr-dev am: ae41b142e8 am: 77dff21365"