am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit '6a2296d856fe4db524ab71c6500f356ff0454f29':
  Cleanup DeferredLayerUpdater