Merge "Fix Smooth Display screen recording" into 24D1-dev