Merge "Winscope: apply surface transforms in preview"