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