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