Merge "Make PipMotionHelper injectable" into sc-dev