Merge "Don't update the primaryBouncerShow state if delegate is null" into main