Merge "Add simple circle-drawing widget" into sc-dev