Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev