Merge "5/ Show Flicker properties on Winscope (WM)" into sc-dev