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

* commit 'fc1d8f0a96285c61264fe4ba079caccabcb6206d':
  Fix deadlock by keeping local copy of currentUserId