Merge "Fix an NPE when launching an activity that's not found."