Merge "Ignore launch_adjacent when launch from App picker" into udc-qpr-dev