Merge "Handle uid state changes on the handler thread." into udc-qpr-dev