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

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