Merge "Hammerhead camera: Fix unused variables"