Merge "No auto soft keyboard when fp is in use" into mnc-dev