Merge "Revert "HWC: use aligned width and height for rearranging ROI""