am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad

* commit '23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4':
  Workaround for re-applying transform on new surface texuture