Merge "Fix off-by-1 error in new SpaceBitmap"