Merge "Revert "Fixed incorrect calculation of dirty invalidation area"" into klp-dev