Merge change 5190 into donut

* changes:
  Fix 1933269: startPreview failed.