Merge "Fix security bug for startActivityInTaskFragment" into tm-dev