Merge "Fix null-pointer in AbsSwipeUpHandler.buildAnimationController" into udc-dev