Merge changes Iaa0846b8,Id9420941

* changes:
  Remove extra isCurrent calls.
  Move image creation out of latchBuffer().