Merge "Add functions to parcel nullable surface controls"