Merge "Fix truncation in Allow diagonal scrolling" into udc-dev