Merge "Avoid locking in getCurrentUser when there is no user switch"