Merge "Reuse StateChange logic in SysUIState" into main