Merge "Allow CryptKeeper to be started for UI debugging"