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

* commit '4f2443a5a31cbe09fe8f5e89fa1d08d185d9ae50':