Merge "Restore proper nav buttons translation when taskbar is recreated" into tm-qpr-dev