Merge "Fix ChooserActivity crash when launched with a caller-provided target" into tm-qpr-dev