Merge "Align divider bar color to taskbar color" into udc-dev