Merge "Use the screenshot theme on wmshell screenshot tests" into main