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

* commit '6bef14bb4c4c54728cd9da63ca33ce84a900bc22':
  Fix issue where custom content pops in (issue 11209357)