Merge "Enable two-part fade out for splash screen reveal anim" into main