Merge "Move the CryptKeeper to Settings." into honeycomb