Deal with race condition where iOS keyboard would jump underneith button press.
Merge branch 'master' into MNF

* master:
  Deal with race condition where iOS keyboard would jump underneith button press.