Merge "Activity Transitions: Don't do a shared element exit transition twice."