Merge "Update the current user again after registering UserChangeListener" into main