Merge "Don\'t save secure surfaces." into nyc-dev
am: b173b7c

* commit 'b173b7c8d8bf8b76931afcf691147d1ad10ef65f':
  Don't save secure surfaces.