Merge "Creates ChooserActivity alias" into udc-qpr-dev