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

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