Merge "Fixed an issue where clearing transient views could ANR" into nyc-dev
am: b745a89c1f

* commit 'b745a89c1f1cec0bfc14c5cd3053b32b0ffc22fe':
  Fixed an issue where clearing transient views could ANR

Change-Id: Ia38f5fc483078241124b92b1ab15a30b7544014f