Merge "Align the scroll ballistics with the pointing ballistics." into udc-dev