Merge "Respect disable flag in LargeScreenHeader" into tm-dev