Merge "Support for video size to be different from captured picture size."