Merge "Extract variables related to Emoji to a separate class." into main