Merge "Fix NPE during Activity transition using wrong Activity."