Merge "Fixes for ChooserTargetActivity"