Merge "Do not log surface destroy by default" into nyc-mr1-dev am: dc02317d92
am: 4800ade070

Change-Id: I9f3b7958a2e8c740a218fdafcafae37cb179ef09