Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null"