Merge "Fix BandSelectionUiTest fail in some device"