Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
am: 9aa43e6320

Change-Id: I0889a00cbdc54d401484391d66e0dd06ac92fd71