LILY-486: Stop empty subject in template overwriting subject in compose
Merge branch 'feature/LILY-486-fix-empty-subject-template-overwrite' into develop