Merge "Fix tests related LargeScreenHeader height for when refactor flag is ON" into main