Merge "Suppress ViewInflationDuringSwipeUp test." into ub-launcher3-master