Merge "Camera: Improve error handling of device state listeners" into udc-dev