Merge "Revert "fix the flash caused by missing setMatrix() when surface size changes""