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

Change-Id: I7b54b9e5ef0a6ba5464d24bc9f17f0c29d297fb4