Merge "Add instrumentation for window re-sizing CUJ in Desktop Windowing mode." into main