Merge pull request #19078 from seamuslee001/emoiji_test_api3