Merge "SysUI Tests: Make tests not break SysUI" into lmp-mr1-dev