Merge "Fix NPE when going "back" from Activity Transition."