am ee6e27c1: Merge "Stop using AppToken movement and start using Task."

# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit 'ee6e27c122491356f5203b105206a55f0e984fe7':
  Stop using AppToken movement and start using Task.