Merge "Avoid launching dialogs twice from double-clicking a preference." into jb-dev