am 4bae1f66: am 8f45e3e2: am be425cce: Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1

* commit '4bae1f66021a76a9e2c0598f9e7f293f56178405':
  Fix issue #5522658: Menu button shown on lock screen if app underneath requests it