Merge "Fixed a flicker of group notifications" into oc-dev