Merge "Update camera2 API usage" into ub-camera-glacier