Merge "ViewCaptureAwareWindowManager - Add Factory interface" into main