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

* commit 'bc8da2c7536c3a632f7d03aa27b77025e15d298a':