Merge "Remove flag, use new api for auto on in settings." into main