am 28795d88: Merge "Fix race condition with preview callback." into jb-dev

* commit '28795d883a34f5393ff00dca0a54aca79b2607d5':
  Fix race condition with preview callback.