Merge "Always suppress scrim for taskbar" into udc-dev