Merge "Suppress ViewInflationDuringSwipeUp test." into sc-dev