Merge "Adding ViewCaptureAwareWindowManager to NavigationBar window." into main