Merge "Clean up getCurrentUser refactor" into main