Merge changes from topic "boot-splash" into pi-dev
am: 59fda04bfd

Change-Id: I448ac3f9872d10ad973779206dd184c20aaa506e