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

Change-Id: I6af0e16c731a0d3c43908b24a9b5223fa1c801f0