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

Change-Id: Ia5a12355fd1ed7ec8c9e4cea68e5b17764479ebd