Merge "Fix Smooth Display screen recording" into main