am 31e68c7e: 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 '31e68c7e692c53be8925036ca6b671c64c516700':