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

Change-Id: Ieeb6783f450bbc78bd2879556fdf71a836cf530d