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

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

Change-Id: I835103a509e11f4ccb2a6c9e2541e22481b2d37b