Merge "Use scheduled writes to package-restrictions and user xml"