Merge "Use screen dimensions as default video size"