Merge "Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev am: 5c53c6c6 am: 366f83c9"