Merge "Prevent cross-activity animation if scene transition is set"