Merge "Fixing crash in SysUI due to invalid group." into nyc-dev