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

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