Merge "Make removeDesktop oneway" into main