Merge "Clear old clip rect when creating new surface." into mnc-dev