Merge "Fix ChooserActivity stuck disabled" into udc-dev