Merge "Fixes NPE in AbsSwipeUpHandler." into sc-dev