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