Merge "Fix deadlock between package manager and settings"