Splash screen generation in good shape now

Change-Id: I01ae6975606e4bbfb6183d137fa261e3ba92eb97