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

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