Merge "Fixes the flicker when transfer splash screen view to client" into sc-v2-dev