Merge "Respect nav button tinting in SUW" into tm-qpr-dev