Yep that is the plan. There is a good table in the article that shows the implementation for each service and rationale for it. Most of the iCloud services are

Yep that is the plan. There is a good table in the article that shows the implementation for each service and rationale for it. Most of the iCloud services are now able to enable an optional feature where the user’s devices are the only ones that have keys.