Merge changes I69e7ef22,I6ca5a886 into main

* changes:
  Enforce dark mode in QS
  Create a border for focus.