Merge "Prevent exception when quick switching between two split pairs" into udc-dev