Check out this: Long Term R&D: PQ security (proposal)
It seems like they’ve definitely contemplated it.