Merge "Preserve flags field of event passed to injectKeyEvent()"