Merge "Add transition latency test for activity switch in the same task"