Merge "[Multi-user] Convert key-value flow to use user id"