Merge changes I239f9357,I57a32ac5 into main

* changes:
  Update setting taskbar window height
  Set bubble bar aligned to QSB