DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505 -s ours
am: 27d769e3b0 -s ours
Change-Id: Ie414fbc28d07642febe6c6dcf2e30283fbc802c0
This commit is contained in: