Merge "Fix component query/binding for multiuser" into udc-dev