Merge "Allow unregistring callbacks in DeviceStateController" into udc-dev