Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev