Merge "Adding ViewCaptureAwareWindowManager to ScreenDecorations window." into main