am 3c123ad7: am 3d36f54a: am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev

* commit '3c123ad726892edce6df173787ff89e103332b70':
  No auto soft keyboard when fp is in use