Merge "Remove NEW_HEADERS flag" into tm-qpr-dev