Merge "Using ViewCaptureAwareWindowManager for adding and removing windows in SystemUI instead of WindowManager, to add view capture tracing." into main