Merge "Do not show soft keyboard when locked out" into mnc-dev