Merge "Enable handling of keycode_menu key event on lockscreen when compose bouncer is enabled" into main