Merge "Updates sfps animations for natural orientation" into tm-qpr-dev