Merge "Update static copy of winscope"