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

Change-Id: I6f530895662f5e39a4fffb932c4139de54fd5b59