Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev