Merge "Make new headers flag true by default" into tm-qpr-dev