Merge "restore coverage lost in NotoColorEmoji transition" into klp-dev