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

* commit '6e4140c6e2d6f14ba225b2ae5926cc0f2794056a':
  Cleanup DeferredLayerUpdater