UI unification changes to MotionTracking