am 2456b973: Merge "Fix issue where custom content pops in (issue 11209357)"...
am 2456b973: Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose
* commit '2456b973':
Fix issue where custom content pops in (issue 11209357)