Merge "Translate the taskbar icons to match nav handle shape." into tm-qpr-dev