Merge "Preparation for adding the AddDesktopButton to the view hierarchy" into main