Merge "Instrument views inflation in systrace" into jb-mr2-dev