Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a2 am: d93090d9" into nyc-mr1-dev-plus-aosp