Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505  -s ours am: 27d769e3b0  -s ours" into cw-f-dev am: 986912ee69  -s ours am: a19e7ca122  -s ours"