Merge changes I26c7d64e,I7ec6d824 into udc-dev

* changes:
  [Settings] update the db list when back to UI
  [Settings] Fix the inconsistent data/entity when switch the app/fragment