Merge "Remove workaround for SysUI SCO deprecation" into main