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

Change-Id: I1cd48f2d91c3eb9052ddf70ad2e75d562a332a62