Merge "rename mInvalidRegion to mSwapRegion"