Merge "Camera: Add dynamic depth tags"