Merge "Fix touches in Large screen header" into tm-qpr-dev