Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev