Merge "Make dirtyrect use map container instead of vector" into devel/master