Merge "Improvements on KeyEventTest."