Merge "bt: Use group id to select color for icon" into udc-dev