Merge "Update winscope dependencies" into sc-dev