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