Merge "Use frame stride and slice height" into marshmallow-cts-dev