Merge "Don't save secure surfaces." into nyc-dev