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

Change-Id: I22d44dde99093cbcf10ca8cddb3beccfdc9bdafb