Merge "sdm: Add support to recompute rectangles considering flips"