Merge "Properly apply the SUW dynamic color theme" into tm-dev