Merge "Fix: SSH abandon or restore adds the cover message twice"