Merge "Don't transfer splash screen if activity is finishing." into tm-dev