am 15a01d72: Merge "Do not show key preview of settings and shortcut key" into ics-mr1

* commit '15a01d72724ce7f0a9a5814443a03b907962f3fd':
  Do not show key preview of settings and shortcut key