Merge "Update auto on text based on toggle value." into main