Merge "Camera: add profiling traces"