Merge "Guard against overflow errors for transparent regions" into tm-qpr-dev