Merge \\\"Support self-explanatory icon for GET INKEY and GET INPUT commands\\\" am: c0eda576ba am: 39531a94d0
am: 4bdae1b0a4

Change-Id: I62a1271a275d08c6f427840714cea5549fd3fe84