Merge "Call updateChooserCounts with the correct user id" into rvc-dev