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