Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev