Merge "Fix the enforcing method to pass current user for visible background users" into main