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