am 4e2683a4: Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf

* commit '4e2683a4b582d28bb320308b5e5f3541ae1aa310':
  Fix issue where custom content would be invisible (issue 11644432)