Merge "Correct order of split action buttons"