Merge "Fix SystemUI compilation when Compose flag is enabled" into udc-qpr-dev