Merge "Add isPivotSet/resetPivot" into pi-dev