Merge "Move updateMatrix() call to animateCommon" into mnc-dev