Merge "Return null when resource not found for key glyph" into main