Merge "Use primaryUserOnly attribute to disable CryptKeeper"