Merge "Write policy file on background thread"