Merge "Refresh user list a little more eagerly" into lmp-mr1-dev