Merge "Fix deadlock between PackageManager and DisplayManager" into main