Merge "inferno: fix zooming flamegraph." am: f889f26e87
am: 2f499f6df0

Change-Id: I1304153f4fd1a52096c633571df85ab814bfae5a