Merge "Fix bad aspect ratios for recorded effects" into jb-dev