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

Change-Id: I16c1990b1763a4663d4e483446fb7c7eb2b17320