Merge "Fix field reordering on toggle switch" into pi-dev