Fix issue where custom content would show up on boot (issue 10713745)

Change-Id: I1c03784970fe1a88e2561f1c5367979cda825973
3 files changed