Merge "Clean up calls to Rect.intersect()" into mnc-dev