Merge "[Multi-user] Store user id in UserBMS"