am 1226be43: Merge "Fix custom content scroll effects bug (recent regression) (issue 11188769)" into jb-ub-now-indigo-rose

* commit '1226be4398d848fe59ddf9718d9a2939ae5b8e43':
  Fix custom content scroll effects bug (recent regression) (issue 11188769)