Merge "Defer maybeUpgradeRow() post-send since they can trigger on non-POST"