Merge "Fix app crash from transfer splash screen view during relaunch" into main