am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into klp-dev

* commit '88ee0dac81dec12aefdeee23072df9b3864a06a4':
  Move DeferredDisplayState out of ops