Merge "Fixing some imports in SysUI tests" into sc-dev