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

Change-Id: Iba76ac2ab8040345075a80bf5061ea465491a35c