Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
am: 2613fb543a

Change-Id: I82e061d321a935aed4ec9334b51c16d713991d67