am 2235ecd5: am f8ac5c34: Merge "Reset the setOnKeyListener callback when view is destroyed"

* commit '2235ecd5ec06e48bbcecb6f22a653e470d94dfef':
  Reset the setOnKeyListener callback when view is destroyed