Merge "Fix concurrent writes to the hardware composer" into oc-dr1-dev