Merge "Make winscope compatible with flickerlib constructors" into sc-dev