Merge "Fixed incorrect calculation of dirty invalidation area"