Merge "overlay: Use correct downscale for rotator."