Merge "Clean up usages of findCurrentGuestUser"