Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
am: 64d7220153

Change-Id: I02e3fc3a6738f6b691b57fa3f2771d647e93cd7a