Merge "Improve jank on header change." into nyc-mr1-dev