Merge "Finish any event in the current input queue" into jb-mr2-dev