Merge "Merge "Use splashscreen if we can't fill horizontaly with snapshot"...
Merge "Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev am: 04c3cc6d am: 71e1b227" into oc-dr1-dev-plus-aosp
am: a4714675
Change-Id: I0eedca3950ce2d0ca7db49fc611859f5e1721c6e