Merge "Fix issue 5131056: key beeps when screen is locked"