Merge "Fix a typo in ctrl_set_render_size()"