Merge "Clean up obsolete screen record code" into main