Merge "Fix CtsNetTestCases for secondary_user_on_secondary_display" into main