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

* commit '19e3742930ac35703c46cf8bab5f73bf9b6b86a3':