Merge "Cleanups to how "save draft" state is handled."