Merge "Improve ModesUi (and related) flag checks in SystemUI" into main