Merge "Revert "Update user profiles on user unavailable"" into sc-dev