Merge "Reduce surface placement of sync group" into tm-qpr-dev