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

* commit '2456b9738803b5f4314b6747dd7eea116d03eb3d':
  Fix issue where custom content pops in (issue 11209357)