Merge "Fix rendering issue after cancelling Notifications inside a group" into tm-qpr-dev