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

* commit 'ca101c6a3bc0fa8444b369dd644790ae54e47d25':