Merge "Camera: Add support for 4K camcorder"