Merge "Remove requirement for kiss emoji should have gender"