Merge "WM: Fix input dispatch timeout for instrumented processes"