Merge "Fixed a crash when the transformed view was updated while dragging" into nyc-dev am: c4e7046
am: 357453f

* commit '357453ff38b349c67dae95e383d243f3ef71566f':

Change-Id: I9180d9413d4a9e2650e160d2b68576c43def1a66