Merge "Revert "Convert clipboard access to use new APIs"" into main