Merge "Do not log surface destroy by default" into nyc-mr1-dev