Merge "Expose findCurrentGuestUser() to system apps"