Merge "Set mCurrentButton after keyboard =" into mnc-dev