Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev