Merge "Fix the bug that user setting is removed when switching"