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

Change-Id: I41da230d6264cd8e5ea9b9be52756f651441e8da