Merge "Create a shell API to remove desktop" into main