Merge "[automerger skipped] Merge "Introduce a way to debug relayouts and slow measures/layout" into tm-qpr-dev am: c261087167 am: 5723dd76b0 -s ours"