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

* commit '7838ff6c455cea0fdab8dda4b7cb95cb462f9dd9':