Merge "Passing instrumentation to LauncherInstrumentation" into ub-launcher3-master