Merge "Extend supported band combination check" into udc-dev