Merge "Fix wrong target launches in Chooser."