Merge "Fix MENU key in keyguard." into jb-mr1-dev