Merge "Clean cherry-pick 'Fix the auto-select UI.'"