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

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