Merge "Make it possible to toggle individual policies."