Merge "Disallow scroll to the AddDesktopButton" into main