Merge "Handler-ize InstrumentationListener and related code"