Merge "Restrict what activity launches show permission prompts" into tm-dev