Merge "Skip drawing taskbar background in setup" into udc-dev