Merge "Winscope: Fix how layers with transforms and positions are rendered"