Merge "Revert "Make group name edit dialog appcompat""