Merge "Move CryptKeeper to own process" into mnc-dev