Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev