am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
  Cleanup DeferredLayerUpdater