am 4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad

* commit '4bbcb6da1e94ebd811e97deb1df2133fc0e39ef2':
  Fix wrong applied fx