Merge "Check for null ActivityInfo."