Merge "Correct the page scrolls of the AddDesktopButton" into main