Merge "Fix anr when installing package"