Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev