Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1