Merge "Revert "Add support for taskbar background to wrap around hotseat"" into main