Merge "Fix the bug that user setting is removed when switching" into tm-qpr-dev