Rebased with 4c1b693f, for conditional rendering of splash in layouts