Merge "Fix the empty preference after clicking gear icon"