Merge "Camera: cleanup some dead code" into qt-dev