Merge "Update screen record dialog to spec" into sc-dev