Merge "Dump offscreen layers in dumpsys and winscope trace"