Merge "Add temporary logging around Activity Manager NPE."