Minor fix for glyphing using CurrentInput

Change-Id: Iabeb3225098efb1e4683ab22d37f5282c954e406
Merge topic 'glyph_fix' into master

e1346040 Minor fix for glyphing using CurrentInput