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

* commit '3bfe1b38973103c105ead34345f8d30e6c3660db':
  Fix issue where custom content would show up on boot (issue 10713745)