Merge "Check the user visibility only when visible background user is enabled" into main