NXP-15126: clear draft and remove blocking popup on save