Merge "Implement new splash screen API" into oc-dev