Merge "IMS-VT: Fix race-condition causing preview freeze." into nyc-dev am: 1f77177
am: d75990c

* commit 'd75990c1c893caf86cc09a2ccf6d0c3937401194':
  IMS-VT: Fix race-condition causing preview freeze.

Change-Id: I4162ad954b4d78c365265bded0c720935553368c