Merge "Fix Lazy layers trace parsing in winscope" into tm-dev