Index: src/wp-content/themes/twentyseventeen/assets/css/ie9.css
===================================================================
--- src/wp-content/themes/twentyseventeen/assets/css/ie9.css	(revision 39398)
+++ src/wp-content/themes/twentyseventeen/assets/css/ie9.css	(working copy)
@@ -4,13 +4,15 @@
 */
 
 .has-header-image.twentyseventeen-front-page .custom-header,
-.has-header-image.home.blog .custom-header {
+.header-video-loaded.twentyseventeen-front-page .custom-header,
+.has-header-image.home.blog .custom-header,
+.header-video-loaded.home.blog .custom-header {
 	height: 300px;
 }
 
 .has-header-image .custom-header-image img,
-.has-header-image .custom-header-image video,
-.has-header-image .custom-header-image iframe {
+.header-video-loaded .custom-header-image video,
+.header-video-loaded .custom-header-image iframe {
 	min-width: 100%;
 }
 
@@ -17,9 +19,13 @@
 @media screen and (min-width: 30em) {
 
 	.has-header-image.twentyseventeen-front-page .custom-header,
+	.header-video-loaded.twentyseventeen-front-page .custom-header,
 	.has-header-image.home.blog .custom-header,
+	.header-video-loaded.home.blog .custom-header,
 	.twentyseventeen-front-page.has-header-image .custom-header-image,
+	.twentyseventeen-front-page.header-video-loaded .custom-header-image,
 	.home.blog.has-header-image .custom-header-image,
+	.home.blog.header-video-loaded .custom-header-image,
 	.panel-image {
 		height: 700px;
 	}
@@ -28,9 +34,13 @@
 @media screen and (min-width: 48em) {
 
 	.has-header-image.twentyseventeen-front-page .custom-header,
+	.header-video-loaded.twentyseventeen-front-page .custom-header,
 	.has-header-image.home.blog .custom-header,
+	.header-video-loaded.home.blog .custom-header,
 	.twentyseventeen-front-page.has-header-image .custom-header-image,
+	.twentyseventeen-front-page.header-video-loaded .custom-header-image,
 	.home.blog.has-header-image .custom-header-image,
+	.home.blog.header-video-loaded .custom-header-image,
 	.panel-image {
 		height: 1000px;
 	}
Index: src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js
===================================================================
--- src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js	(revision 39398)
+++ src/wp-content/themes/twentyseventeen/assets/js/customize-preview.js	(working copy)
@@ -60,7 +60,7 @@
 					clip: 'auto',
 					position: 'relative'
 				});
-				$( '.site-branding, .site-branding a, .site-description, .site-description a' ).css({
+				$( '.site-title a, .site-description' ).css({
 					color: to
 				});
 				$( 'body' ).removeClass( 'title-tagline-hidden' );
@@ -123,11 +123,15 @@
 	$.each( [ 'external_header_video', 'header_image', 'header_video' ], function( index, settingId ) {
 		wp.customize( settingId, function( setting ) {
 			setting.bind(function() {
-				if ( hasHeaderImage() || ( hasHeaderVideo() && $( 'body' ).hasClass( 'twentyseventeen-front-page' ) ) ) {
+				if ( hasHeaderImage() ) {
 					$( document.body ).addClass( 'has-header-image' );
 				} else {
 					$( document.body ).removeClass( 'has-header-image' );
 				}
+
+				if( ! hasHeaderVideo() ) {
+					$( document.body ).removeClass( 'header-video-loaded' );
+				}
 			} );
 		} );
 	} );
Index: src/wp-content/themes/twentyseventeen/assets/js/global.js
===================================================================
--- src/wp-content/themes/twentyseventeen/assets/js/global.js	(revision 39398)
+++ src/wp-content/themes/twentyseventeen/assets/js/global.js	(working copy)
@@ -4,7 +4,6 @@
 	// Variables and DOM Caching.
 	var $body = $( 'body' ),
 		$customHeader = $body.find( '.custom-header' ),
-		$customHeaderImage = $customHeader.find( '.custom-header-image' ),
 		$branding = $customHeader.find( '.site-branding' ),
 		$navigation = $body.find( '.navigation-top' ),
 		$navWrap = $navigation.find( '.wrap' ),
@@ -65,7 +64,7 @@
 			if ( navIsNotTooTall ) {
 
 				// When there's a custom header image, the header offset includes the height of the navigation.
-				if ( isFrontPage && $customHeaderImage.length ) {
+				if ( isFrontPage && ( $body.hasClass( 'has-header-image' ) || $body.hasClass( 'header-video-loaded' ) ) ) {
 					headerOffset = $customHeader.innerHeight() - navigationOuterHeight;
 				} else {
 					headerOffset = $customHeader.innerHeight();
@@ -176,6 +175,17 @@
 		}
 	}
 
+	/*
+	 * Add a class when the custom header video is loaded.
+	 * Used for styles that should only be applied when a video is on page. Similar to `.has-header-image` class.
+	 */
+	$( document ).on( 'wp-custom-header-video-loaded', function () {
+		// Apply only on the front page.
+		if ( isFrontPage ) {
+			$body.addClass( 'header-video-loaded' );
+		}
+	} );
+
 	// Fire on document ready.
 	$( document ).ready( function() {
 
Index: src/wp-content/themes/twentyseventeen/inc/color-patterns.php
===================================================================
--- src/wp-content/themes/twentyseventeen/inc/color-patterns.php	(revision 39398)
+++ src/wp-content/themes/twentyseventeen/inc/color-patterns.php	(working copy)
@@ -443,8 +443,11 @@
 .colors-custom .next.page-numbers:focus,
 .colors-custom .next.page-numbers:hover,
 .colors-custom.has-header-image .site-title,
+.colors-custom.header-video-loaded .site-title,
 .colors-custom.has-header-image .site-title a,
-.colors-custom.has-header-image .site-description {
+.colors-custom.header-video-loaded .site-title a,
+.colors-custom.has-header-image .site-description,
+.colors-custom.header-video-loaded .site-description {
 	color: hsl( ' . $hue . ', ' . $saturation . ', 100% ); /* base: #fff; */
 }
 
Index: src/wp-content/themes/twentyseventeen/inc/custom-header.php
===================================================================
--- src/wp-content/themes/twentyseventeen/inc/custom-header.php	(revision 39398)
+++ src/wp-content/themes/twentyseventeen/inc/custom-header.php	(working copy)
@@ -87,14 +87,20 @@
 		.colors-dark .site-title a,
 		.colors-custom .site-title a,
 		body.has-header-image .site-title a,
+		body.header-video-loaded .site-title a,
 		body.has-header-image.colors-dark .site-title a,
+		body.header-video-loaded.colors-dark .site-title a,
 		body.has-header-image.colors-custom .site-title a,
+		body.header-video-loaded.colors-custom .site-title a,
 		.site-description,
 		.colors-dark .site-description,
 		.colors-custom .site-description,
 		body.has-header-image .site-description,
+		body.header-video-loaded .site-description,
 		body.has-header-image.colors-dark .site-description,
-		body.has-header-image.colors-custom .site-description {
+		body.header-video-loaded.colors-dark .site-description,
+		body.has-header-image.colors-custom .site-description,
+		body.header-video-loaded.colors-custom .site-description {
 			color: #<?php echo esc_attr( $header_text_color ); ?>;
 		}
 	<?php endif; ?>
Index: src/wp-content/themes/twentyseventeen/inc/template-functions.php
===================================================================
--- src/wp-content/themes/twentyseventeen/inc/template-functions.php	(revision 39398)
+++ src/wp-content/themes/twentyseventeen/inc/template-functions.php	(working copy)
@@ -34,8 +34,8 @@
 		$classes[] = 'twentyseventeen-front-page';
 	}
 
-	// Add a class if there is a custom header.
-	if ( has_header_image() || has_header_video() && is_front_page() ) {
+	// Add a class if there is a custom header image.
+	if ( has_header_image() && is_front_page() ) {
 		$classes[] = 'has-header-image';
 	}
 
Index: src/wp-content/themes/twentyseventeen/style.css
===================================================================
--- src/wp-content/themes/twentyseventeen/style.css	(revision 39398)
+++ src/wp-content/themes/twentyseventeen/style.css	(working copy)
@@ -1580,8 +1580,8 @@
 	opacity: 1; /* Prevent opacity from changing during selective refreshes in the customize preview */
 }
 
-body.has-header-image .site-title,
-body.has-header-image .site-title a {
+body.has-header-image .site-title a,
+body.header-video-loaded .site-title a {
 	color: #fff;
 }
 
@@ -1592,7 +1592,8 @@
 	margin-bottom: 0;
 }
 
-body.has-header-image .site-description {
+body.has-header-image .site-description,
+body.header-video-loaded .site-description {
 	color: #fff;
 	opacity: 0.8;
 }
@@ -1610,7 +1611,8 @@
 	width: auto;
 }
 
-body.home.title-tagline-hidden.has-header-image .custom-logo-link img {
+body.home.title-tagline-hidden.has-header-image .custom-logo-link img,
+body.home.title-tagline-hidden.header-video-loaded .custom-logo-link img {
 	max-height: 200px;
 	max-width: 100%;
 }
@@ -1630,7 +1632,9 @@
 }
 
 .has-header-image.twentyseventeen-front-page .custom-header,
-.has-header-image.home.blog .custom-header {
+.has-header-image.home.blog .custom-header,
+.header-video-loaded.twentyseventeen-front-page .custom-header,
+.header-video-loaded.home.blog .custom-header {
 	display: table;
 	height: 300px;
 	height: 75vh;
@@ -1637,7 +1641,8 @@
 	width: 100%;
 }
 
-.custom-header-image {
+.has-header-image .custom-header-image,
+.header-video-loaded .custom-header-image {
 	bottom: 0;
 	left: 0;
 	overflow: hidden;
@@ -1647,7 +1652,8 @@
 	width: 100%;
 }
 
-.custom-header-image:before {
+.has-header-image .custom-header-image:before,
+.header-video-loaded .custom-header-image:before {
 	/* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#000000+0,000000+100&0+0,0.3+75 */
 	background: -moz-linear-gradient(to top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 75%, rgba(0, 0, 0, 0.3) 100%); /* FF3.6-15 */
 	background: -webkit-linear-gradient(to top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 75%, rgba(0, 0, 0, 0.3) 100%); /* Chrome10-25,Safari5.1-6 */
@@ -1664,8 +1670,8 @@
 }
 
 .has-header-image .custom-header-image img,
-.has-header-image .custom-header-image video,
-.has-header-image .custom-header-image iframe {
+.header-video-loaded .custom-header-image video,
+.header-video-loaded .custom-header-image iframe {
 	position: fixed;
 	height: auto;
 	left: 50%;
@@ -1720,12 +1726,14 @@
 
 /* Hides div in Customizer preview when header images or videos change. */
 
-body:not(.has-header-image) .custom-header-image {
+body:not(.has-header-image):not(.header-video-loaded) .custom-header-image {
 	display: none;
 }
 
 .has-header-image.twentyseventeen-front-page .site-branding,
-.has-header-image.home.blog .site-branding {
+.has-header-image.home.blog .site-branding,
+.header-video-loaded.twentyseventeen-front-page .site-branding,
+.header-video-loaded.home.blog .site-branding {
 	display: table-cell;
 	height: 100%;
 	vertical-align: bottom;
@@ -3271,7 +3279,9 @@
 	}
 
 	.has-header-image.twentyseventeen-front-page .site-branding,
-	.has-header-image.home.blog .site-branding {
+	.has-header-image.home.blog .site-branding,
+	.header-video-loaded.twentyseventeen-front-page .site-branding,
+	.header-video-loaded.home.blog .site-branding {
 		bottom: 0;
 		display: block;
 		left: 0;
@@ -3282,7 +3292,9 @@
 	}
 
 	.has-header-image.twentyseventeen-front-page .custom-header,
-	.has-header-image.home.blog .custom-header {
+	.has-header-image.home.blog .custom-header,
+	.header-video-loaded.twentyseventeen-front-page .custom-header,
+	.header-video-loaded.home.blog .custom-header {
 		display: block;
 		height: auto;
 	}
@@ -3293,12 +3305,15 @@
 	}
 
 	.twentyseventeen-front-page.has-header-image .custom-header-image,
-	.home.blog.has-header-image .custom-header-image {
+	.home.blog.has-header-image .custom-header-image,
+	.twentyseventeen-front-page.header-video-loaded .custom-header-image,
+	.home.blog.header-video-loaded .custom-header-image {
 		height: 0;
 		position: relative;
 	}
 
-	.has-header-image:not(.twentyseventeen-front-page):not(.home) .custom-header-image {
+	.has-header-image:not(.twentyseventeen-front-page):not(.home) .custom-header-image,
+	.header-video-loaded:not(.twentyseventeen-front-page):not(.home) .custom-header-image {
 		bottom: 0;
 		height: auto;
 		left: 0;
@@ -3312,11 +3327,13 @@
 	}
 
 	.custom-logo-link img,
-	body.home.title-tagline-hidden.has-header-image .custom-logo-link img {
+	body.home.title-tagline-hidden.has-header-image .custom-logo-link img,
+	body.home.title-tagline-hidden.header-video-loaded .custom-logo-link img {
 		max-width: 350px;
 	}
 
-	.title-tagline-hidden.home.has-header-image .custom-logo-link img {
+	.title-tagline-hidden.home.has-header-image .custom-logo-link img,
+	.title-tagline-hidden.home.header-video-loaded .custom-logo-link img {
 		max-height: 200px;
 	}
 
@@ -3578,12 +3595,16 @@
 	/* Front Page */
 
 	.twentyseventeen-front-page.has-header-image .site-branding,
-	.home.blog.has-header-image .site-branding {
+	.home.blog.has-header-image .site-branding,
+	.twentyseventeen-front-page.header-video-loaded .site-branding,
+	.home.blog.header-video-loaded .site-branding {
 		margin-bottom: 70px;
 	}
 
 	.twentyseventeen-front-page.has-header-image .custom-header-image,
-	.home.blog.has-header-image .custom-header-image {
+	.home.blog.has-header-image .custom-header-image,
+	.twentyseventeen-front-page.header-video-loaded .custom-header-image,
+	.home.blog.header-video-loaded .custom-header-image {
 		height: 1200px;
 		height: 100vh;
 		max-height: 100%;
@@ -3591,12 +3612,16 @@
 	}
 
 	.twentyseventeen-front-page.has-header-image .custom-header-image:before,
-	.home.blog.has-header-image .custom-header-image:before {
+	.home.blog.has-header-image .custom-header-image:before,
+	.twentyseventeen-front-page.header-video-loaded .custom-header-image:before,
+	.home.blog.header-video-loaded .custom-header-image:before {
 		height: 33%;
 	}
 
 	.admin-bar.twentyseventeen-front-page.has-header-image .custom-header-image,
-	.admin-bar.home.blog.has-header-image .custom-header-image {
+	.admin-bar.home.blog.has-header-image .custom-header-image,
+	.admin-bar.twentyseventeen-front-page.header-video-loaded .custom-header-image,
+	.admin-bar.home.blog.header-video-loaded .custom-header-image {
 		height: calc(100vh - 32px);
 	}
 
@@ -4111,7 +4136,9 @@
 	}
 
 	.twentyseventeen-front-page.has-header-image .site-branding,
-	.home.blog.has-header-image .site-branding {
+	.home.blog.has-header-image .site-branding,
+	.twentyseventeen-front-page.header-video-loaded .site-branding,
+	.home.blog.header-video-loaded .site-branding {
 		position: relative;
 	}
 
@@ -4149,8 +4176,8 @@
 	body,
 	a,
 	.site-title a,
-	.twentyseventeen-front-page.has-header-image .site-title,
-	.twentyseventeen-front-page.has-header-image .site-title a {
+	.twentyseventeen-front-page.has-header-image .site-title a,
+	.twentyseventeen-front-page.header-video-loaded .site-title a {
 		color: #222 !important; /* Make sure color schemes don't affect to print */
 	}
 
@@ -4159,6 +4186,7 @@
 	blockquote,
 	.site-description,
 	.twentyseventeen-front-page.has-header-image .site-description,
+	.twentyseventeen-front-page.header-video-loaded .site-description,
 	.entry-meta,
 	.entry-meta a {
 		color: #777 !important; /* Make sure color schemes don't affect to print */