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

* commit 'ac8ed11db3ccfa4f017bbb20d49c463595e6d90a':
  Fix race condition with preview callback.