Merge "Adding ViewCaptureAwareWindowManager to AssistDisclosure window." into main