Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev