Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev