Merge "Add Analytics support to Winscope" into main