Merge "Implement new splash screen API" into oc-dev
am: 46ae660bf2

Change-Id: I2f12289fcf82754a46365d0342997ae7bf59a2f8