Merge "Fix band select UI issue."