Merge "Rename DesktopMode API back" into main