Merge "Make AddDesktopButton can be navigated to through keys" into main