Merge changes Ibc81d80b,I51d99207 into sc-v2-dev

* changes:
  Don't draw taskbar background during gestures
  Draw rounded corners above the taskbar