Merge "SideBySide2: Disable cancel button on new drafts with text"