Merge "Update WindowManager Jetpack in SC" into sc-dev