Merge "Change Activity Scene Transitions to be more automatic."