Merge "Update test for change in calculation of split portrait clipping" into tm-qpr-dev