Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev