Merge "TIF: Set the surface secure" into nyc-dev