Merge "Initial implementation of the AddDesktopButton" into main