Merge "Fix system server crash during movePackage"