Merge "[Custom Key Glyph] Show function row keys according to key glyph" into main