Merge "Fix deadlock by keeping local copy of currentUserId" into klp-dev