Merge "Add missing methods in host version of Surface" into main