Merge "Fixing surface blur when using multiple surfaces" into tm-qpr-dev