Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
am: 04c3cc6d12

Change-Id: I9d9afbb3161bd5abfa9d4fe2a98e00b643b602ea