Merge "Remove join/split buttons for profile"