Merge changes I79008ba1,Iac6718b5 into main

* changes:
  Minor UI Changes
  Capturing user's selected custom key combination for shortcuts