Merge "Always flush renderstate in DeferredLayerUpdater::apply"