Merge "Fix launcher <-> taskbar dark themed icons background color" into tm-qpr-dev