Fix NPE during Activity transition using wrong Activity. am: a3edbf6a5d
am: 34abaebd3b

Change-Id: Ia21fab56d6ca3767d270e5336334dfb1e066bf5f