am 97247096: am 38892095: 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 '972470963907e21096891220b2a5ce784bf1e7e3':