Merge "Translate the TutorialStepIndicator to prevent overlapping skip and done buttons" into tm-qpr-dev