Merge "Support KeyEvent.KEYCODE_ENTER on the keyguard" into udc-qpr-dev