Merge "Change the camera id to match the front camera ID" into udc-dev