Merge "Move DeferredDisplayState out of ops" into klp-dev