Merge "Camera: Add support for video rotation"