am 85d6ba4d: am ca101c6a: am 7838ff6c: am 19e37429: am 3bfe1b38: am 21cd002f: Fix issue where custom content would show up on boot (issue 10713745)

* commit '85d6ba4d6a3e04f9d7313719d3658bcfeca1b616':