Merge "Cleanup flickerlib in Winscope." into main