Merge "Fix NPE when popping ANR dialog for system"