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

* commit '3f30e67afbceb185c52833cec539cc0199716ef0':
  Move DeferredDisplayState out of ops