Merge "[Custom Key Glyph] Add aconfig flag for shortcut custom key glyph" into main