Moving toward mass-conserving simulations of plasma turbulence and kinetic neutrals in the tokamak boundary with the GBS code