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