Merge "Fix apparent delay in removing a managed profile"