Merge "Handling multiple profiles for PK layout selection" into udc-dev