Merge "Revert "Add screenrecord/demote TwoPanelWokrspaceTest"" into main