SOC-4521 | [User Setting] Fix bugs when reviewing on new branch.