Merge "Diagnosing when only SysUI is visible." into sc-v2-dev