Merge "Delay pinned animation finish during app transition." into nyc-dev am: 08c4dfb am: cb1198a52e
am: 5daac13a17

* commit '5daac13a17d7fb79c594023b51d24df8dc2706e0':
  Delay pinned animation finish during app transition.

Change-Id: I950bfccc1ad4ba2505001e65f6c1e5624c0e0f92