DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.
am: c9373e5505  -s ours

Change-Id: I9cd703751daedc696285d7023dc8f1aac1deaa3e