Merge "Fix NPE in SystemUI" into main