I wonder if your concern would be addressed if Figma allowed creating a private branch that you could merge back later.