Merge commit '4f91a2b7446f919a6315202e9a714286418d8f8c' * commit '4f91a2b7446f919a6315202e9a714286418d8f8c': Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices