Merge "Fix bug with pivot point not including translationXY factors"