Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev