Merge "Camera: Address device state listener delay" into udc-qpr-dev