Merge "No input instead of disabling password entry" into mnc-dev