Merge changes I0b36f486,Ida0d0dee into sc-dev

* changes:
  Improve Stretch shader performance more
  Improve Stretch shader performance