Merge "fix rotate + save draft creating multiple drafts" into jb-ub-mail