Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev