Merge "Cleanup DeferredLayerUpdater" into lmp-dev