Merge "Extract getIntentUser function in ResolverActivity" into tm-qpr-dev