Merge "Update lint check to accommodate new emoji sequences"