Merge changes I608d4b61,Ia7900e75 into pi-dev

* changes:
  Follow up to Ia7900e753b29187a7a7b81f393666687e8b8e04b
  Apply surface parameters in sync with RenderThread