Avoid mixing signals received by settings updates - Fixes #4759

Signed-off-by: Gonzalo Odiard <godiard@sugarlabs.org>