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

Change-Id: I28694bee5e1768ba51a8d60290587c6d56e930df