Merge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev

* changes:
  Fixes a usability issue where groups were clearable
  Fixed a bug where notifications could reappear