Merge "Group name edit input fixes"