Merge changes from topic "revert-20248350-flipFlag-VHUZTJRHFU" into tm-qpr-dev

* changes:
  Revert "Fix touches in Large screen header"
  Revert "Make new headers flag true by default"