Merge changes I97841c5b,I64e47f92 into main

* changes:
  feat(EDT): Update the preference interaction and visiblity logic
  feat(EDT): Migrate entry into Display Settings