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

* commit '08c4dfba82fff75a2530bf8c694a40b306f8396e':
  Delay pinned animation finish during app transition.

Change-Id: Id7ac481dcb282863f37759504db181d6dd2130d8