Merge "Make it configurable to display the allowed characters in the digit mode"
am: c98d4e9461

Change-Id: Ie251623e553874e21ba99e338656ef023bfd497a