Merge "Deprecate WM APIs" into main