Merge "[DO NOT MERGE] Full - Compatibilize winscope with master" into sc-v2-dev