am 4d3290a6: Merge "Set mCurrentButton after keyboard =" into mnc-dev

* commit '4d3290a6c77d4d9dd06dbbfbeea5c35d9f5aaad5':
  Set mCurrentButton after keyboard =