Merge "hwc: Set full screen aspect ratio deviation within tolerance level"