Merge "Handle AddDesktopButton's visibility in different launcher states" into main