Merge "Fix suw display size flicker problem" into sc-v2-dev