Merge "Synchronize on sysui dependency references" into oc-dev