am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev

* commit '21f16a475d0a212f9d3fb36659de5a59c2f80484':
  Cancel or drop key events if activity is stopped.