Merge "TIF: Unhide the surface layout API" into mnc-dev