Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev am: 9aa43e63 am: a4988d09 am: 6749238c Change-Id: Ieeb6783f450bbc78bd2879556fdf71a836cf530d