Merge "Fix potential crash when exit splash screen"