Merge "Revert "Add screenrecord for simple reorder widgets test"" into main