Merge "Fix lost singleton provider after force-stopping user or package."