Merge "Skip transfer splash screen if activity is destroying or destroyed" into tm-dev