Merge "Update FdToString impl behind flag" into main