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

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