Merge "Revert "Draw rounded corners above the taskbar"" into sc-v2-dev