Merge commit '8fdb89bb33dc50dae1198f0b35dfd8ad2bc2c344' * commit '8fdb89bb33dc50dae1198f0b35dfd8ad2bc2c344': Follow key event API changes.