Merge "Clean up ScreenRecord for AddWidgetTest" into sc-v2-dev