Merge "Winscope: apply surface transforms in preview"
am: 456ccff485

Change-Id: I2711f7ed3b2e4b818c4badf1f2469a3d8762ec4a