Merge changes I0022344c,I1779f958,If1b1abb3 into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev am: 02965424
Fixes a usability issue where groups were clearable am: 506deb69
Fixed a bug where notifications could reappear am: 9e624e73