Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev