Merge "Fix early hint missing safety margin" into tm-qpr-dev