Merge "Make single bounding rect when none set relative to window origin" into main