Merge "Implement the legacy splash screen behavior" into sc-dev