Merge "Fix UI tests failed on band selection and directory"