Merge "Improving diagnostics when Launcher dies during a gesture" into ub-launcher3-master