Merge "Reorder overflow button with kotlin refactor"