Merge "Remove permission token from startActivityAsCaller" into tm-dev