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

Change-Id: I048aeb67b8e17bbece7a07827ffb3745c6adbe63