Merge "fix InactiveApps instrumentation" into mnc-dev