Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev