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

Change-Id: I37a02992a66fb0b9c1cceba926340690db014f87