Merge "Camera3: Add more tracing"