diff --git a/.dev-lib b/.dev-lib
index 6c7ef38..40a78e7 100644
--- a/.dev-lib
+++ b/.dev-lib
@@ -1,2 +1,6 @@
 WPCS_GIT_TREE=develop
 ASSETS_DIR=wp-assets
+
+if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.2" ]] || [[ ${TRAVIS_PHP_VERSION:0:3} == "5.3" ]]; then
+	DEV_LIB_SKIP="$DEV_LIB_SKIP,phpcs"
+fi
diff --git a/.travis.yml b/.travis.yml
index 5a82b06..1f54919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,13 @@ language:
   - node_js
 
 php:
-  - 5.3
+  - 5.2
   - 7.0
 
 env:
   - WP_VERSION=trunk WP_MULTISITE=0
   - WP_VERSION=latest WP_MULTISITE=0
-  - WP_VERSION=4.6.1 WP_MULTISITE=0
+  - WP_VERSION=4.7.6 WP_MULTISITE=0
   - WP_VERSION=latest WP_MULTISITE=1
 
 install:
diff --git a/composer.json b/composer.json
index 0777c41..d7087d2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "xwp/wp-customize-posts",
 	"description": "Manage posts and postmeta via the Customizer.",
-	"version": "0.8.7",
+	"version": "0.9.1",
 	"type": "wordpress-plugin",
 	"keywords": [ "customizer", "customize", "posts", "postmeta", "preview", "featured-image", "page-template" ],
 	"homepage": "https://github.com/xwp/wp-customize-posts/",
diff --git a/css/customize-posts.css b/css/customize-posts.css
index c02d273..4c6c465 100644
--- a/css/customize-posts.css
+++ b/css/customize-posts.css
@@ -439,3 +439,10 @@ body.customize-posts-content-editor-pane-resize #customize-preview:before {
 	content: "\f464";
 	top: -2px;
 }
+
+@media screen and (max-width:600px) {
+	.outer-section-open .select2-container,
+	.outer-section-open .select2-selection__clear {
+		z-index: auto !Important;
+	}
+}
diff --git a/css/edit-post-preview-customize.css b/css/edit-post-preview-customize.css
index b554c55..accd732 100644
--- a/css/edit-post-preview-customize.css
+++ b/css/edit-post-preview-customize.css
@@ -6,7 +6,8 @@
 #customize-header-actions #snapshot-save,
 #snapshot-status-button-wrapper,
 #snapshot-preview-link,
-#snapshot-expand-button
+#snapshot-expand-button,
+#publish-settings
 {
 	display: none !important;
 }
diff --git a/customize-posts.php b/customize-posts.php
index 5d68a8c..69efe7b 100644
--- a/customize-posts.php
+++ b/customize-posts.php
@@ -3,7 +3,7 @@
  * Plugin Name: Customize Posts
  * Description: Manage posts and postmeta via the Customizer.
  * Plugin URI: https://github.com/xwp/wp-customize-posts/
- * Version: 0.8.7
+ * Version: 0.9.1
  * Author: XWP
  * Author URI: https://make.xwp.co/
  * License: GPLv2+
diff --git a/dev-lib b/dev-lib
index d8540c1..52874e4 160000
--- a/dev-lib
+++ b/dev-lib
@@ -1 +1 @@
-Subproject commit d8540c1f036c583f48af5f63c3f6d04db36c0db3
+Subproject commit 52874e44d9e737dfc8f1e9ca33381f45deb9b636
diff --git a/js/customize-featured-image.js b/js/customize-featured-image.js
index fbbc236..4ba10c7 100644
--- a/js/customize-featured-image.js
+++ b/js/customize-featured-image.js
@@ -123,11 +123,6 @@ var CustomizeFeaturedImage = (function( api ) {
 			} );
 		};
 
-		control.active.set( true );
-		control.active.validate = function validateForcingTrue() {
-			return true;
-		};
-
 		// Register.
 		api.control.add( control.id, control );
 
diff --git a/js/customize-page-template.js b/js/customize-page-template.js
index bad52b7..052b28f 100644
--- a/js/customize-page-template.js
+++ b/js/customize-page-template.js
@@ -50,7 +50,7 @@ var CustomizePageTemplate = (function( api ) {
 	 * @returns {wp.customize.Control|null} The control.
 	 */
 	component.addControl = function( section ) {
-		var supports, control, controlId, settingId, isActiveCallback;
+		var supports, control, controlId, settingId;
 		supports = api.Posts.data.postTypes[ section.params.post_type ].supports;
 
 		if ( ! supports['page-attributes'] || 'page' !== section.params.post_type ) {
@@ -103,13 +103,13 @@ var CustomizePageTemplate = (function( api ) {
 		 *
 		 * @returns {boolean} Is active.
 		 */
-		isActiveCallback = function() {
+		function isActiveCallback() {
 			var defaultSize = 1;
 			if ( api.has( 'page_for_posts' ) && parseInt( api( 'page_for_posts' ).get(), 10 ) === section.params.post_id ) {
 				return false;
 			}
 			return _.size( control.params.choices ) > defaultSize;
-		};
+		}
 		control.active.set( isActiveCallback() );
 		control.active.validate = isActiveCallback;
 		api( 'page_for_posts', function( pageOnFrontSetting ) {
diff --git a/js/customize-post-section.js b/js/customize-post-section.js
index 3674b49..6421741 100644
--- a/js/customize-post-section.js
+++ b/js/customize-post-section.js
@@ -307,16 +307,17 @@
 		 * unless the notification is specifically for this control's setting property.
 		 *
 		 * @this {wp.customize.Control}
-		 * @param {string} code                            Notification code.
-		 * @param {wp.customize.Notification} notification Notification object.
+		 * @param {string|wp.customize.Notification} notification - Notification object to add. Alternatively code may be supplied, and in that case the second notificationObject argument must be supplied.
+		 * @param {wp.customize.Notification} [notificationObject] - Notification to add when first argument is the code string.
 		 * @returns {wp.customize.Notification|null} Notification if not bypassed.
 		 */
-		addPostFieldControlNotification: function addPostFieldControlNotification( code, notification ) {
-			var isSettingNotification, isSettingPropertyNotification;
+		addPostFieldControlNotification: function addPostFieldControlNotification( notification, notificationObject ) {
+			var isSettingNotification, isSettingPropertyNotification, code;
+			code = 'string' === typeof notification ? notification : notification.code;
 			isSettingNotification = -1 !== code.indexOf( ':' ) || notification.setting; // Note that sniffing for ':' is deprecated as of #36944 & #37890.
 			isSettingPropertyNotification = notification.data && notification.data.setting_property === this.setting_property;
 			if ( isSettingPropertyNotification || ! isSettingNotification ) {
-				return api.Values.prototype.add.call( this, code, notification );
+				return ( api.Notifications || api.Values ).prototype.add.call( this, notification, notificationObject );
 			} else {
 				return null;
 			}
@@ -393,11 +394,6 @@
 				}
 			} );
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.post_title = control;
 			api.control.add( control.id, control );
@@ -451,11 +447,6 @@
 				setting.bind( setPlaceholder );
 			} );
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.post_name = control;
 			api.control.add( control.id, control );
@@ -487,11 +478,6 @@
 				}
 			} );
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.post_status = control;
 			api.control.add( control.id, control );
@@ -524,11 +510,6 @@
 				}
 			} );
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.post_date = control;
 			api.control.add( control.id, control );
@@ -617,11 +598,6 @@
 				}
 			} );
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.post_excerpt = control;
 			api.control.add( control.id, control );
@@ -686,11 +662,6 @@
 				} );
 			}
 
-			// Override preview trying to de-activate control not present in preview context.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.page_parent = control;
 			api.control.add( control.id, control );
@@ -724,11 +695,6 @@
 				}
 			} );
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.menu_order = control;
 			api.control.add( control.id, control );
@@ -761,11 +727,6 @@
 				}
 			} );
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.post_discussion_fields = control;
 			api.control.add( control.id, control );
@@ -809,11 +770,6 @@
 				return data;
 			};
 
-			// Override preview trying to de-activate control not present in preview context. See WP Trac #37270.
-			control.active.validate = function() {
-				return true;
-			};
-
 			// Register.
 			section.postFieldControls.post_author = control;
 			api.control.add( control.id, control );
@@ -826,19 +782,20 @@
 		},
 
 		/**
-		 * Set up section notifications.
+		 * Polyfill notifications API onto sections if not yet on WordPress 4.9 where it is defined in core.
 		 *
+		 * @link <https://core.trac.wordpress.org/ticket/38794>
 		 * @returns {void}
 		 */
-		setupSectionNotifications: function() {
-			var section = this, setting = api( section.id ), debouncedRenderNotifications, setPageForPostsNotice;
-			if ( ! setting.notifications ) {
+		polyfillNotifications: function() {
+			var section = this, debouncedRenderNotifications;
+			if ( section.notifications ) {
 				return;
 			}
 
-			// Add the notifications API.
 			section.notifications = new api.Values({ defaultConstructor: api.Notification });
 			section.notificationsContainer = $( '<div class="customize-control-notifications-container"></div>' );
+			section.notifications.container = section.notificationsContainer;
 			section.notificationsTemplate = wp.template( 'customize-post-section-notifications' );
 			section.container.find( '.customize-section-title' ).after( section.notificationsContainer );
 			section.getNotificationsContainerElement = function() {
@@ -846,17 +803,6 @@
 			};
 			section.renderNotifications = api.Control.prototype.renderNotifications;
 
-			// Sync setting notifications into the section notifications
-			setting.notifications.bind( 'add', function( settingNotification ) {
-				var notification = new api.Notification( setting.id + ':' + settingNotification.code, settingNotification );
-				if ( ! settingNotification.data || ! settingNotification.data.setting_property || ! api.control.has( section.id + '[' + settingNotification.data.setting_property + ']' ) ) {
-					section.notifications.add( notification.code, notification );
-				}
-			} );
-			setting.notifications.bind( 'remove', function( settingNotification ) {
-				section.notifications.remove( setting.id + ':' + settingNotification.code );
-			} );
-
 			/*
 			 * Render notifications when the collection is updated.
 			 * Note that this debounced/deferred rendering is needed for two reasons:
@@ -872,9 +818,40 @@
 			} );
 			section.notifications.bind( 'remove', debouncedRenderNotifications );
 			section.renderNotifications();
+		},
+
+		/**
+		 * Set up section notifications.
+		 *
+		 * @returns {void}
+		 */
+		setupSectionNotifications: function() {
+			var section = this, setting = api( section.id ), setPageForPostsNotice, notificationTemplate;
+			if ( ! setting.notifications ) {
+				return;
+			}
+
+			// Add the notifications API if not present.
+			section.polyfillNotifications();
+
+			// Sync setting notifications into the section notifications
+			setting.notifications.bind( 'add', function( settingNotification ) {
+				var notification = new api.Notification( setting.id + ':' + settingNotification.code, _.extend( {},
+					settingNotification,
+					{
+						template: notificationTemplate
+					}
+				) );
+				if ( ! settingNotification.data || ! settingNotification.data.setting_property || ! api.control.has( section.id + '[' + settingNotification.data.setting_property + ']' ) ) {
+					section.notifications.add( notification.code, notification );
+				}
+			} );
+			setting.notifications.bind( 'remove', function( settingNotification ) {
+				section.notifications.remove( setting.id + ':' + settingNotification.code );
+			} );
 
 			// Dismiss conflict block when clicking on button.
-			section.notificationsContainer.on( 'click', '.override-post-conflict', function( e ) {
+			section.notifications.container.on( 'click', '.override-post-conflict', function( e ) {
 				var ourValue;
 				e.preventDefault();
 				ourValue = _.clone( setting.get() );
@@ -890,6 +867,7 @@
 			} );
 
 			// Detect conflict errors.
+			notificationTemplate = wp.template( 'customize-post-field-notification' );
 			api.bind( 'error', function( response ) {
 				var theirValue, ourValue,
 					conflictedControls = [];
diff --git a/js/customize-posts.js b/js/customize-posts.js
index 4ee5edd..83bc7d1 100644
--- a/js/customize-posts.js
+++ b/js/customize-posts.js
@@ -571,7 +571,7 @@
 	 * @return {void}
 	 */
 	component.focusControl = function focusControl( controlId ) {
-		var control, section, postSectionId, matches;
+		var control, section, postSectionId, matches, postId;
 
 		/**
 		 * Attempt focus on the control.
@@ -594,18 +594,33 @@
 		if ( ! matches ) {
 			return;
 		}
-		postSectionId = 'post[' + matches[1] + '][' + matches[2] + ']';
-		section = api.section( postSectionId );
-		if ( ! section || ! section.extended( component.PostSection ) ) {
-			return;
+		postId = parseInt( matches[2], 10 );
+		postSectionId = 'post[' + matches[1] + '][' + String( postId ) + ']';
+
+		/**
+		 * Expand and focus on control in section.
+		 *
+		 * @param {component.PostSection} postSection - Section.
+		 * @returns {void}
+		 */
+		function sectionResolved( postSection ) {
+			postSection.expand();
+			postSection.contentsEmbedded.done( function() {
+				var ms = 500;
+
+				// @todo It is not clear why a delay is needed for focus to work. It could be due to focus failing during animation.
+				_.delay( tryFocus, ms );
+			} );
 		}
-		section.expand();
-		section.contentsEmbedded.done( function() {
-			var ms = 500;
 
-			// @todo It is not clear why a delay is needed for focus to work. It could be due to focus failing during animation.
-			_.delay( tryFocus, ms );
-		} );
+		section = api.section( postSectionId );
+		if ( section ) {
+			sectionResolved( section );
+		} else {
+			api.Posts.ensurePosts( [ postId ] ).done( function( data ) {
+				sectionResolved( data[ postId ].section );
+			} );
+		}
 	};
 
 	/**
diff --git a/package.json b/package.json
index 2a6d5da..d997444 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/xwp/wp-customize-posts.git"
   },
-  "version": "0.8.7",
+  "version": "0.9.1",
   "license": "GPL-2.0+",
   "private": true,
   "devDependencies": {
diff --git a/php/class-wp-customize-dynamic-control.php b/php/class-wp-customize-dynamic-control.php
index 30901c7..dba072f 100644
--- a/php/class-wp-customize-dynamic-control.php
+++ b/php/class-wp-customize-dynamic-control.php
@@ -74,7 +74,7 @@ protected function content_template() {
 		$data = $this->json();
 		?>
 		<#
-		_.defaults( data, <?php echo wp_json_encode( $data ) ?> );
+		_.defaults( data, <?php echo wp_json_encode( $data ); ?> );
 		data.input_id = 'input-' + String( Math.random() );
 		#>
 		<# if ( 'checkbox' === data.field_type ) { #>
diff --git a/php/class-wp-customize-featured-image-controller.php b/php/class-wp-customize-featured-image-controller.php
index 0ec4ca8..6d4343b 100644
--- a/php/class-wp-customize-featured-image-controller.php
+++ b/php/class-wp-customize-featured-image-controller.php
@@ -404,7 +404,7 @@ public function sanitize_setting( $attachment_id, WP_Customize_Postmeta_Setting
 		 * and the meta is registered wit WP_Customize_Featured_Image_Controller::sanitize_value() as the sanitize_callback().
 		 * So $attachment_id is either a valid attachment ID, -1, or false.
 		 */
-		if ( ! $is_valid  ) {
+		if ( ! $is_valid ) {
 			return $has_setting_validation ? new WP_Error( 'invalid_attachment_id', __( 'The attachment is invalid.', 'customize-posts' ) ) : null;
 		}
 
diff --git a/php/class-wp-customize-post-date-control.php b/php/class-wp-customize-post-date-control.php
index f009b69..9ea6e48 100644
--- a/php/class-wp-customize-post-date-control.php
+++ b/php/class-wp-customize-post-date-control.php
@@ -60,12 +60,12 @@ protected function content_template() {
 		$data = $this->json();
 		?>
 		<#
-		_.defaults( data, <?php echo wp_json_encode( $data ) ?> );
+		_.defaults( data, <?php echo wp_json_encode( $data ); ?> );
 		data.input_id_base = 'input-' + String( Math.random() );
 		#>
 		<span class="customize-control-title">
 			<label for="{{ data.input_id_base }}_month">{{ data.label }}</label>
-			<span class="wrap-reset-time">(<a href="javascript:void(0)" class="reset-time"><?php esc_html_e( 'Reset', 'customize-posts' ) ?></a>)</span>
+			<span class="wrap-reset-time">(<a href="javascript:void(0)" class="reset-time"><?php esc_html_e( 'Reset', 'customize-posts' ); ?></a>)</span>
 		</span>
 
 		<?php
@@ -86,10 +86,10 @@ protected function content_template() {
 			/* translators: %s: UTC offset  */
 			$date_control_description = sprintf( __( 'Timezone is %s.', 'customize-posts' ), $tz_abbr );
 		}
+
+		// @todo Use the new WP_Customize_Date_Time_Control in 4.9, or use an HTML5 details element for the time info once browser support is better.
 		?>
 		<div class="description customize-control-description">
-			<?php // @todo Use an HTML5 details element for the time info once browser support is better. ?>
-
 			<a href="javascript:void(0)" tabindex="0" role="button" aria-controls="{{ data.input_id_base }}_time_info" class="time-info-handle" aria-pressed="false">
 				<span class="time-handle-arrow dashicons dashicons-arrow-down"></span>
 				<?php echo esc_html( $tz_abbr ); ?>
diff --git a/php/class-wp-customize-post-discussion-fields-control.php b/php/class-wp-customize-post-discussion-fields-control.php
index 012dc02..40cfeb0 100644
--- a/php/class-wp-customize-post-discussion-fields-control.php
+++ b/php/class-wp-customize-post-discussion-fields-control.php
@@ -29,7 +29,7 @@ protected function content_template() {
 		$data = $this->json();
 		?>
 		<#
-		_.defaults( data, <?php echo wp_json_encode( $data ) ?> );
+		_.defaults( data, <?php echo wp_json_encode( $data ); ?> );
 		data.ping_status_input_id = 'input-' + String( Math.random() );
 		data.comment_status_input_id = 'input-' + String( Math.random() );
 		#>
diff --git a/php/class-wp-customize-post-editor-control.php b/php/class-wp-customize-post-editor-control.php
index e6a2ea2..95141b9 100644
--- a/php/class-wp-customize-post-editor-control.php
+++ b/php/class-wp-customize-post-editor-control.php
@@ -60,14 +60,14 @@ protected function content_template() {
 		$data = $this->json();
 		?>
 		<#
-		_.defaults( data, <?php echo wp_json_encode( $data ) ?> );
+		_.defaults( data, <?php echo wp_json_encode( $data ); ?> );
 		data.input_id = 'input-' + String( Math.random() );
 		#>
 		<span class="customize-control-title"><label for="{{ data.input_id }}">{{ data.label }}</label></span>
 		<# if ( data.description ) { #>
 			<span class="description customize-control-description">{{ data.description }}</span>
 		<# } #>
-		<button id="{{ data.input_id }}" type="button" class="button toggle-post-editor"><?php esc_html_e( 'Open Editor', 'customize-posts' ) ?></button>
+		<button id="{{ data.input_id }}" type="button" class="button toggle-post-editor"><?php esc_html_e( 'Open Editor', 'customize-posts' ); ?></button>
 		<?php
 	}
 }
diff --git a/php/class-wp-customize-post-field-partial.php b/php/class-wp-customize-post-field-partial.php
index 70c623e..f2a6d9f 100644
--- a/php/class-wp-customize-post-field-partial.php
+++ b/php/class-wp-customize-post-field-partial.php
@@ -142,11 +142,21 @@ public function render_post_title( $partial, $context, $post ) {
 
 		if ( ! empty( $post->post_password ) ) {
 			/** This filter is documented in wp-includes/post-template.php */
-			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s', 'customize-posts' ), $post );
+			$protected_title_format = apply_filters(
+				'protected_title_format',
+				/* translators: %s is post title */
+				__( 'Protected: %s', 'customize-posts' ),
+				$post
+			);
 			$rendered = sprintf( $protected_title_format, $rendered );
 		} elseif ( isset( $post->post_status ) && 'private' === $post->post_status ) {
 			/** This filter is documented in wp-includes/post-template.php */
-			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s', 'customize-posts' ), $post );
+			$private_title_format = apply_filters(
+				'private_title_format',
+				/* translators: %s is post title */
+				__( 'Private: %s', 'customize-posts' ),
+				$post
+			);
 			$rendered = sprintf( $private_title_format, $rendered );
 		}
 
diff --git a/php/class-wp-customize-post-setting.php b/php/class-wp-customize-post-setting.php
index 2638b57..e6b026d 100644
--- a/php/class-wp-customize-post-setting.php
+++ b/php/class-wp-customize-post-setting.php
@@ -303,6 +303,7 @@ public function sanitize( $post_data ) {
 			if ( $locked_user ) {
 				$user = get_user_by( 'ID', $locked_user );
 				$error_message = sprintf(
+					/* translators: %s is user display name */
 					__( 'Post is currently locked by %s.', 'customize-posts' ),
 					$user ? $user->display_name : __( '(unknown user)', 'customize-posts' )
 				);
@@ -323,6 +324,7 @@ public function sanitize( $post_data ) {
 			if ( $is_update_conflict ) {
 				$user = get_user_by( 'ID', get_post_meta( $this->post_id, '_edit_last', true ) );
 				$error_message = sprintf(
+					/* translators: %s is user display name */
 					__( 'Conflict due to concurrent post update by %s.', 'customize-posts' ),
 					$user ? $user->display_name : __( '(unknown user)', 'customize-posts' )
 				);
diff --git a/php/class-wp-customize-post-status-control.php b/php/class-wp-customize-post-status-control.php
index e7e08ba..1f88526 100644
--- a/php/class-wp-customize-post-status-control.php
+++ b/php/class-wp-customize-post-status-control.php
@@ -60,7 +60,7 @@ protected function content_template() {
 		$data = $this->json();
 		?>
 		<#
-		_.defaults( data, <?php echo wp_json_encode( $data ) ?> );
+		_.defaults( data, <?php echo wp_json_encode( $data ); ?> );
 		data.input_id = 'input-' + String( Math.random() );
 		#>
 		<span class="customize-control-title"><label for="{{ data.input_id }}">{{ data.label }}</label></span>
@@ -85,8 +85,8 @@ protected function content_template() {
 				<option value="{{ value }}">{{ text }}</option>
 			<# } ); #>
 		</select>
-		<a class="trash" href="javascript:void(0)"><?php esc_html_e( 'Move to Trash', 'customize-posts' ) ?></a>
-		<a class="untrash" href="javascript:void(0)"><?php esc_html_e( 'Undo Trash', 'customize-posts' ) ?></a>
+		<a class="trash" href="javascript:void(0)"><?php esc_html_e( 'Move to Trash', 'customize-posts' ); ?></a>
+		<a class="untrash" href="javascript:void(0)"><?php esc_html_e( 'Undo Trash', 'customize-posts' ); ?></a>
 		<?php
 	}
 }
diff --git a/php/class-wp-customize-postmeta-setting.php b/php/class-wp-customize-postmeta-setting.php
index b19c8f4..dd08ea6 100644
--- a/php/class-wp-customize-postmeta-setting.php
+++ b/php/class-wp-customize-postmeta-setting.php
@@ -168,6 +168,7 @@ public function sanitize( $meta_value ) {
 			$values = array( $meta_value );
 		} else {
 			if ( ! is_array( $meta_value ) ) {
+				/* translators: %s is meta key */
 				return $has_setting_validation ? new WP_Error( 'expected_array', sprintf( __( 'Expected array value for non-single "%s" meta.', 'customize-posts' ), $meta_key ) ) : null;
 			}
 			$values = $meta_value;
@@ -194,6 +195,7 @@ public function sanitize( $meta_value ) {
 			/** This filter is documented in wp-includes/meta.php */
 			$check = apply_filters( "update_{$meta_type}_metadata", null, $object_id, $meta_key, $value, $prev_value );
 			if ( null !== $check ) {
+				/* translators: %s is meta key */
 				return $has_setting_validation ? new WP_Error( 'not_allowed', sprintf( __( 'Update to post meta "%s" blocked.', 'customize-posts' ), $meta_key ) ) : null;
 			}
 		}
diff --git a/php/class-wp-customize-posts-panel.php b/php/class-wp-customize-posts-panel.php
index 1aad6ea..ff7364c 100644
--- a/php/class-wp-customize-posts-panel.php
+++ b/php/class-wp-customize-posts-panel.php
@@ -63,7 +63,7 @@ public function __construct( WP_Customize_Manager $manager, $id, array $args ) {
 	 */
 	public function print_template() {
 		?>
-		<script type="text/html" id="tmpl-customize-posts-<?php echo esc_attr( $this->post_type ) ?>-panel-actions">
+		<script type="text/html" id="tmpl-customize-posts-<?php echo esc_attr( $this->post_type ); ?>-panel-actions">
 			<li class="customize-posts-panel-actions">
 				<select class="post-selection-lookup"></select>
 
@@ -76,19 +76,19 @@ public function print_template() {
 				<# } #>
 			</li>
 		</script>
-		<script type="text/html" id="tmpl-customize-posts-<?php echo esc_attr( $this->post_type ) ?>-panel-select2-selection-item">
+		<script type="text/html" id="tmpl-customize-posts-<?php echo esc_attr( $this->post_type ); ?>-panel-select2-selection-item">
 			<# if ( ! data.id ) { // placeholder #>
 				{{ data.text }}
 			<# } else { #>
-				<em><?php esc_html_e( 'Loading &ldquo;{{ data.text }}&rdquo;&hellip;', 'customize-posts' ) ?></em>
+				<em><?php esc_html_e( 'Loading &ldquo;{{ data.text }}&rdquo;&hellip;', 'customize-posts' ); ?></em>
 			<# } #>
 		</script>
-		<script type="text/html" id="tmpl-customize-posts-<?php echo esc_attr( $this->post_type ) ?>-panel-select2-result-item">
+		<script type="text/html" id="tmpl-customize-posts-<?php echo esc_attr( $this->post_type ); ?>-panel-select2-result-item">
 			<# if ( data.featured_image && data.featured_image.sizes && data.featured_image.sizes.thumbnail && data.featured_image.sizes.thumbnail.url ) { #>
 				<img class="customize-posts-select2-thumbnail" src="{{ data.featured_image.sizes.thumbnail.url }}">
 			<# } #>
 			<# if ( data.status && 'trash' === data.status ) { #>
-				<em><?php esc_html_e( '[Trashed]', 'customize-posts' ) ?></em>
+				<em><?php esc_html_e( '[Trashed]', 'customize-posts' ); ?></em>
 				<span class="trashed-title">{{ data.title }}</span>
 			<# } else if ( data.text ) { #>
 				{{ data.text }}
@@ -97,7 +97,7 @@ public function print_template() {
 			<# } #>
 		</script>
 
-		<script id="tmpl-customize-panel-posts-<?php echo esc_attr( $this->post_type ) ?>-notice" type="text/html">
+		<script id="tmpl-customize-panel-posts-<?php echo esc_attr( $this->post_type ); ?>-notice" type="text/html">
 			<div class="customize-posts-panel-notice">
 				<em>{{ data.message }}</em>
 			</div>
diff --git a/php/class-wp-customize-posts-preview.php b/php/class-wp-customize-posts-preview.php
index 6a1bdbe..7cb3dc7 100644
--- a/php/class-wp-customize-posts-preview.php
+++ b/php/class-wp-customize-posts-preview.php
@@ -225,12 +225,22 @@ public function filter_the_title( $title, $post ) {
 			if ( ! empty( $post_data['post_password'] ) ) {
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s', 'customize-posts' ), $mock_post );
+				$protected_title_format = apply_filters(
+					'protected_title_format',
+					/* translators: %s is post title */
+					__( 'Protected: %s', 'customize-posts' ),
+					$mock_post
+				);
 				$title = sprintf( $protected_title_format, $title );
 			} elseif ( isset( $post_data['post_status'] ) && 'private' === $post_data['post_status'] ) {
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s', 'customize-posts' ), $mock_post );
+				$private_title_format = apply_filters(
+					'private_title_format',
+					/* translators: %s is post title */
+					__( 'Private: %s', 'customize-posts' ),
+					$mock_post
+				);
 				$title = sprintf( $private_title_format, $title );
 			}
 		}
@@ -323,7 +333,14 @@ public function filter_get_pages_to_preview_settings( $initial_posts, $args ) {
 		$unsupported_args = array( 'offset', 'meta_key', 'meta_value' );
 		foreach ( $unsupported_args as $unsupported_arg ) {
 			if ( ! empty( $args[ $unsupported_arg ] ) ) {
-				_doing_it_wrong( 'get_pages', sprintf( esc_html__( 'The %s argument for get_pages() is not supported by Customize Posts.', 'customize-posts' ), esc_html( $unsupported_arg ) ), '0.8.0' );
+				_doing_it_wrong(
+					'get_pages',
+					sprintf(
+						/* translators: %s is unsupported arg name */
+						esc_html__( 'The %s argument for get_pages() is not supported by Customize Posts.', 'customize-posts' ), esc_html( $unsupported_arg )
+					),
+					'0.8.0'
+				);
 				return false;
 			}
 		}
@@ -1355,7 +1372,15 @@ public function get_post_field_partial_schema( $field_id = '' ) {
 		foreach ( $schema as $_field_id => $_partial_args ) {
 			foreach ( $deprecated_keys as $deprecated_key ) {
 				if ( array_key_exists( $deprecated_key, $_partial_args ) ) {
-					_deprecated_argument( __FUNCTION__, '0.8.5', sprintf( __( 'The %s param has been removed from the partial schema. Consider fallback_dependent_selector if needed.', 'customize-posts' ), $deprecated_key ) );
+					_deprecated_argument(
+						__FUNCTION__,
+						'0.8.5',
+						sprintf(
+							/* translators: %s is param name */
+							__( 'The %s param has been removed from the partial schema. Consider fallback_dependent_selector if needed.', 'customize-posts' ),
+							$deprecated_key
+						)
+					);
 				}
 			}
 		}
@@ -1462,7 +1487,7 @@ public function amend_partials_response_with_rest_resources( $response, $selecti
 		// Abort if the partial render request isn't for a post field partial.
 		$requesting_post_field_partial = false;
 		foreach ( array_keys( $partials ) as $partial_id ) {
-			if ( $selective_refresh->get_partial( $partial_id ) instanceof \WP_Customize_Post_Field_Partial ) {
+			if ( $selective_refresh->get_partial( $partial_id ) instanceof WP_Customize_Post_Field_Partial ) {
 				$requesting_post_field_partial = true;
 				break;
 			}
@@ -1474,7 +1499,7 @@ public function amend_partials_response_with_rest_resources( $response, $selecti
 		// Gather the customized posts by type.
 		$posts_by_type = array();
 		foreach ( $selective_refresh->manager->settings() as $setting ) {
-			if ( $setting instanceof \WP_Customize_Post_Setting ) {
+			if ( $setting instanceof WP_Customize_Post_Setting ) {
 				if ( ! isset( $posts_by_type[ $setting->post_type ] ) ) {
 					$posts_by_type[ $setting->post_type ] = array();
 				}
@@ -1497,7 +1522,7 @@ public function amend_partials_response_with_rest_resources( $response, $selecti
 			}
 
 			// @todo Do a separate request for each post individually to improve performance?
-			$request = new \WP_REST_Request( 'GET', '/wp/v2/' . $post_type_object->rest_base );
+			$request = new WP_REST_Request( 'GET', '/wp/v2/' . $post_type_object->rest_base );
 			$request->set_query_params( array(
 				'per_page' => 100,
 				'include' => wp_list_pluck( $posts, 'ID' ),
diff --git a/php/class-wp-customize-posts.php b/php/class-wp-customize-posts.php
index dbea11d..4be531d 100644
--- a/php/class-wp-customize-posts.php
+++ b/php/class-wp-customize-posts.php
@@ -94,6 +94,9 @@ public function __construct( WP_Customize_Manager $manager ) {
 		add_action( 'customize_register', array( $this, 'register_constructs' ), 20 );
 		add_filter( 'map_meta_cap', array( $this, 'filter_map_meta_cap' ), 10, 4 );
 		add_action( 'init', array( $this, 'register_meta' ), 100 );
+		if ( did_action( 'init' ) ) {
+			$this->register_meta(); // The init action will have already done in WP-CLI or WP Cron.
+		}
 		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
 		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_customize_dynamic_setting_class' ), 5, 3 );
 		add_filter( 'customize_sanitize_nav_menus_created_posts', array( $this, 'filter_out_nav_menus_created_posts_for_customized_posts' ), 20 );
@@ -655,7 +658,12 @@ public function get_author_choices() {
 			foreach ( (array) $users as $user ) {
 				$choices[] = array(
 					'value' => (int) $user->ID,
-					'text'  => sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'customize-posts' ), $user->display_name, $user->user_login ),
+					'text'  => sprintf(
+						/* translators: 1 is user display name, 2 is user login */
+						_x( '%1$s (%2$s)', 'user dropdown', 'customize-posts' ),
+						$user->display_name,
+						$user->user_login
+					),
 				);
 			}
 		}
@@ -680,7 +688,12 @@ public function get_date_month_choices() {
 			$month_text = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
 
 			/* translators: 1: month number, 2: month abbreviation */
-			$months[ $i ]['text'] = sprintf( __( '%1$s-%2$s', 'customize-posts' ), $month_number, $month_text );
+			$months[ $i ]['text'] = sprintf(
+				/* translators: 1 is month number and 2 is month text */
+				__( '%1$s-%2$s', 'customize-posts' ),
+				$month_number,
+				$month_text
+			);
 			$months[ $i ]['value'] = $month_number;
 		}
 		return $months;
@@ -827,6 +840,7 @@ public function enqueue_scripts() {
 				'fieldParentLabel' => __( 'Parent', 'customize-posts' ),
 				'fieldOrderLabel' => __( 'Order', 'customize-posts' ),
 				'noTitle' => __( '(no title)', 'customize-posts' ),
+				/* translators: %s is value that other user supplied for setting */
 				'theirChange' => __( 'Their change: %s', 'customize-posts' ),
 				'openEditor' => __( 'Open Editor', 'customize-posts' ), // @todo Move this into editor control?
 				'closeEditor' => __( 'Close Editor', 'customize-posts' ),
@@ -839,6 +853,7 @@ public function enqueue_scripts() {
 				'editPostFailure' => __( 'Failed to open for editing.', 'customize-posts' ),
 				'createPostFailure' => __( 'Failed to create for editing.', 'customize-posts' ),
 				'installCustomizeObjectSelector' => sprintf(
+					/* translators: %s is link to Customize Object Selector plugin */
 					__( 'This control depends on having the %s plugin installed and activated.', 'customize-posts' ),
 					sprintf(
 						'<a href="%s" target="_blank">%s</a>',
@@ -846,7 +861,7 @@ public function enqueue_scripts() {
 						__( 'Customize Object Selector', 'customize-posts' )
 					)
 				),
-				'trashPostNotification' => __( 'This has been untrashed. If you publish changes now, its status will change to the selected status. Move back to trash to avoid this.' , 'customize-posts' ),
+				'trashPostNotification' => __( 'This has been untrashed. If you publish changes now, its status will change to the selected status. Move back to trash to avoid this.', 'customize-posts' ),
 
 				/* translators: %s post type */
 				'jumpToPostPlaceholder' => __( 'Jump to %s', 'customize-posts' ),
@@ -1003,7 +1018,7 @@ public function render_templates() {
 		?>
 		<script id="tmpl-customize-posts-navigation" type="text/html">
 			<button class="customize-posts-navigation dashicons dashicons-visibility" tabindex="0">
-				<span class="screen-reader-text"><?php esc_html_e( 'Preview', 'customize-posts' ); ?> {{ data.label }}</span><?php // @todo This translates poorly ?>
+				<span class="screen-reader-text"><?php esc_html_e( 'Preview', 'customize-posts' ); // @todo This translates with data.label translates poorly. ?> {{ data.label }}</span>
 			</button>
 		</script>
 
@@ -1050,6 +1065,18 @@ public function render_templates() {
 			</button>
 		</script>
 
+		<script type="text/html" id="tmpl-customize-post-field-notification">
+			<li class="notice notice-{{ data.type || 'info' }} {{ data.altNotice ? 'notice-alt' : '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
+				<# if ( /post_update_conflict/.test( data.code ) ) { #>
+					<button class="button override-post-conflict" type="button"><?php esc_html_e( 'Override', 'customize-posts' ); ?></button>
+				<# } #>
+				{{ data.message || data.code }}
+			</li>
+		</script>
+
+		<?php
+		// The following template is obsolete as of WordPress 4.9.
+		?>
 		<script type="text/html" id="tmpl-customize-post-section-notifications">
 			<ul>
 				<# _.each( data.notifications, function( notification ) { #>
@@ -1172,7 +1199,7 @@ public function sanitize_nav_menus_created_posts( $value ) {
 				continue;
 			}
 			$post = get_post( $post_id );
-			if ( 'auto-draft' !== $post->post_status && 'customize-draft' !== $post->post_status ) { // This is the patched line.
+			if ( 'auto-draft' !== $post->post_status && 'draft' !== $post->post_status && 'customize-draft' !== $post->post_status ) { // This is the patched line.
 				continue;
 			}
 			$post_type_obj = get_post_type_object( $post->post_type );
@@ -1438,6 +1465,7 @@ public function ajax_insert_auto_draft_post() {
 		if ( is_wp_error( $r ) ) {
 			$error = $r;
 			$data = array(
+				/* translators: 1 is singular post name, 2 is error message */
 				'message' => sprintf( __( '%1$s could not be created: %2$s', 'customize-posts' ), $singular_name, $error->get_error_message() ),
 			);
 			wp_send_json_error( $data );
@@ -1719,7 +1747,10 @@ public function ajax_search_available_items() {
 		}
 
 		$s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-		$items = $this->manager->nav_menus->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+		$items = $this->manager->nav_menus->search_available_items_query( array(
+			'pagenum' => $p,
+			's' => $s,
+		) );
 
 		if ( empty( $items ) ) {
 			wp_send_json_error( array( 'message' => __( 'No results found.', 'default' ) ) );
diff --git a/phpcs.xml b/phpcs.xml
index e20a77c..fc0d3e0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -20,6 +20,16 @@
 	<rule ref="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing">
 		<severity>0</severity>
 	</rule>
+	<rule ref="Generic.Formatting.MultipleStatementAlignment.NotSameWarning">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned">
+		<severity>0</severity>
+	</rule>
+
+	<arg name="extensions" value="php"/>
+	<arg value="s"/>
+	<file>.</file>
 
 	<exclude-pattern>*/dev-lib/*</exclude-pattern>
 	<exclude-pattern>*/node_modules/*</exclude-pattern>
diff --git a/readme.md b/readme.md
index c347c20..155bdbe 100644
--- a/readme.md
+++ b/readme.md
@@ -6,9 +6,9 @@ Edit posts and postmeta in the Customizer. Stop editing your posts/postmeta blin
 
 **Contributors:** [xwp](https://profiles.wordpress.org/xwp), [westonruter](https://profiles.wordpress.org/westonruter), [valendesigns](https://profiles.wordpress.org/valendesigns), [sayedwp](https://profiles.wordpress.org/sayedwp), [utkarshpatel.](https://profiles.wordpress.org/utkarshpatel.)  
 **Tags:** [customizer](https://wordpress.org/plugins/tags/customizer), [customize](https://wordpress.org/plugins/tags/customize), [posts](https://wordpress.org/plugins/tags/posts), [postmeta](https://wordpress.org/plugins/tags/postmeta), [editor](https://wordpress.org/plugins/tags/editor), [preview](https://wordpress.org/plugins/tags/preview), [featured-image](https://wordpress.org/plugins/tags/featured-image), [page-template](https://wordpress.org/plugins/tags/page-template)  
-**Requires at least:** 4.5.0  
-**Tested up to:** 4.8.1  
-**Stable tag:** 0.8.7  
+**Requires at least:** 4.7.0  
+**Tested up to:** 4.9.0  
+**Stable tag:** 0.9.1  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
 
 [![Build Status](https://travis-ci.org/xwp/wp-customize-posts.svg?branch=master)](https://travis-ci.org/xwp/wp-customize-posts) [![Coverage Status](https://coveralls.io/repos/xwp/wp-customize-posts/badge.svg?branch=master)](https://coveralls.io/github/xwp/wp-customize-posts) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com) [![devDependency Status](https://david-dm.org/xwp/wp-customize-posts/dev-status.svg)](https://david-dm.org/xwp/wp-customize-posts?type=dev) 
@@ -90,6 +90,17 @@ The following are listed in reverse chronological order. The first, more recent
 
 ## Changelog ##
 
+### [0.9.1] - [2017-11-13] ###
+Fix saving of postmeta in scheduled changesets. See [#375](https://github.com/xwp/wp-customize-posts/pull/375).
+
+### [0.9.0] - [2017-11-11] ###
+* Bump minimum required WP version to 4.7; update compatibility for 4.9. See [#371](https://github.com/xwp/wp-customize-posts/pull/371).
+* Update wrapper around `notifications.add` for new params accepted in 4.9. See [#369](https://github.com/xwp/wp-customize-posts/pull/369).
+* Make use of section notifications API in WP 4.9 when available; otherwise polyfill. See [#366](https://github.com/xwp/wp-customize-posts/pull/366).
+* Fix syncing of post changes made in post preview customizer back to edit post screen. See [#361](https://github.com/xwp/wp-customize-posts/pull/361).
+
+See [issues and PRs in milestone](https://github.com/xwp/wp-customize-posts/milestone/8?closed=1) and [full release commit log](https://github.com/xwp/wp-customize-posts/compare/0.8.7...0.9.0).
+
 ### [0.8.7] - [2017-08-03] ###
 * Fixed: Ensure that nested edit shortcuts in Twenty Seventeen front-page panels are positioned properly. See [#357](https://github.com/xwp/wp-customize-posts/pull/357).
 * Fixed: Prevent post field partials from erroneously selecting nested post placements, prevent edit shortcuts from being duplicated, and ensure partials get created for all posts displayed. See [#355](https://github.com/xwp/wp-customize-posts/pull/355), [#356](https://github.com/xwp/wp-customize-posts/pull/356).
diff --git a/readme.txt b/readme.txt
index 0718883..147e962 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
 === Customize Posts ===
 Contributors:      xwp, westonruter, valendesigns, sayedwp, utkarshpatel.
 Tags:              customizer, customize, posts, postmeta, editor, preview, featured-image, page-template
-Requires at least: 4.5.0
-Tested up to:      4.8.1
-Stable tag:        0.8.7
+Requires at least: 4.7.0
+Tested up to:      4.9.0
+Stable tag:        0.9.1
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -67,6 +67,19 @@ The following are listed in reverse chronological order. The first, more recent
 
 == Changelog ==
 
+= [0.9.1] - [2017-11-13] =
+
+Fix saving of postmeta in scheduled changesets. See [#375](https://github.com/xwp/wp-customize-posts/pull/375).
+
+= [0.9.0] - [2017-11-11] =
+
+* Bump minimum required WP version to 4.7; update compatibility for 4.9. See [#371](https://github.com/xwp/wp-customize-posts/pull/371).
+* Update wrapper around `notifications.add` for new params accepted in 4.9. See [#369](https://github.com/xwp/wp-customize-posts/pull/369).
+* Make use of section notifications API in WP 4.9 when available; otherwise polyfill. See [#366](https://github.com/xwp/wp-customize-posts/pull/366).
+* Fix syncing of post changes made in post preview customizer back to edit post screen. See [#361](https://github.com/xwp/wp-customize-posts/pull/361).
+
+See [issues and PRs in milestone](https://github.com/xwp/wp-customize-posts/milestone/8?closed=1) and [full release commit log](https://github.com/xwp/wp-customize-posts/compare/0.8.7...0.9.0).
+
 = [0.8.7] - [2017-08-03] =
 
 * Fixed: Ensure that nested edit shortcuts in Twenty Seventeen front-page panels are positioned properly. See [#357](https://github.com/xwp/wp-customize-posts/pull/357).
diff --git a/tests/data/themes/dummy/class-customize-posts-dummy-support.php b/tests/data/themes/dummy/class-customize-posts-dummy-support.php
new file mode 100644
index 0000000..a5fef4d
--- /dev/null
+++ b/tests/data/themes/dummy/class-customize-posts-dummy-support.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Class Customize_Posts_Dummy_Support
+ *
+ * @package WordPress
+ * @subpackage Customize
+ */
+
+/**
+ * Class Customize_Posts_Dummy_Support
+ *
+ * @codeCoverageIgnore
+ */
+class Customize_Posts_Dummy_Support extends Customize_Posts_Theme_Support {
+
+	/**
+	 * Theme slug.
+	 *
+	 * @access public
+	 * @var string
+	 */
+	public $slug = 'dummy';
+
+	/**
+	 * Add theme support.
+	 *
+	 * @access public
+	 */
+	public function add_support() {
+		add_filter( 'customize_posts_partial_schema', array( $this, 'filter_partial_schema' ) );
+	}
+
+	/**
+	 * Add theme support.
+	 *
+	 * @access public
+	 *
+	 * @param array $schema Partial schema.
+	 * @return array
+	 */
+	public function filter_partial_schema( $schema ) {
+		$schema['post_author[biography]'] = array(
+			'selector' => '.author-info',
+			'fallback_dependent_selector' => 'body.singular',
+			'container_inclusive' => true,
+			'render_callback' => array( $this, 'biography_render_callback' ),
+		);
+
+		return $schema;
+	}
+
+	/**
+	 * Render the post_author biography partial.
+	 *
+	 * @param WP_Customize_Partial $partial Partial.
+	 * @param array                $context Context.
+	 *
+	 * @return string|null
+	 */
+	public function biography_render_callback( WP_Customize_Partial $partial, $context = array() ) {
+		return '<div id="author-info">Biography</div>';
+	}
+}
diff --git a/tests/data/themes/dummy/functions.php b/tests/data/themes/dummy/functions.php
index ec13260..5eff6a3 100644
--- a/tests/data/themes/dummy/functions.php
+++ b/tests/data/themes/dummy/functions.php
@@ -23,59 +23,5 @@ function dummy_support( $wp_customize ) {
 add_action( 'customize_register', 'dummy_support' );
 
 if ( ! class_exists( 'Customize_Posts_Dummy_Support' ) ) {
-	/**
-	 * Class Customize_Posts_Dummy_Support
-	 *
-	 * @codeCoverageIgnore
-	 */
-	class Customize_Posts_Dummy_Support extends Customize_Posts_Theme_Support {
-
-		/**
-		 * Theme slug.
-		 *
-		 * @access public
-		 * @var string
-		 */
-		public $slug = 'dummy';
-
-		/**
-		 * Add theme support.
-		 *
-		 * @access public
-		 */
-		public function add_support() {
-			add_filter( 'customize_posts_partial_schema', array( $this, 'filter_partial_schema' ) );
-		}
-
-		/**
-		 * Add theme support.
-		 *
-		 * @access public
-		 *
-		 * @param array $schema Partial schema.
-		 * @return array
-		 */
-		public function filter_partial_schema( $schema ) {
-			$schema['post_author[biography]'] = array(
-				'selector' => '.author-info',
-				'fallback_dependent_selector' => 'body.singular',
-				'container_inclusive' => true,
-				'render_callback' => array( $this, 'biography_render_callback' ),
-			);
-
-			return $schema;
-		}
-
-		/**
-		 * Render the post_author biography partial.
-		 *
-		 * @param WP_Customize_Partial $partial Partial.
-		 * @param array                $context Context.
-		 *
-		 * @return string|null
-		 */
-		public function biography_render_callback( WP_Customize_Partial $partial, $context = array() ) {
-			return '<div id="author-info">Biography</div>';
-		}
-	}
+	require_once dirname( __FILE__ ) . '/class-customize-posts-dummy-support.php';
 }
diff --git a/tests/php/test-ajax-class-wp-customize-posts.php b/tests/php/test-ajax-class-wp-customize-posts.php
index 46bef7a..4ac164c 100644
--- a/tests/php/test-ajax-class-wp-customize-posts.php
+++ b/tests/php/test-ajax-class-wp-customize-posts.php
@@ -525,7 +525,10 @@ public function test_update_post_changeset_successes() {
 
 		foreach( $settings_data as $key => $data ) {
 			$this->assertEquals( $setting_key, $key );
-			$this->assertArraySubset( $input_data, $data['value'] );
+			$this->assertEquals(
+				wp_array_slice_assoc( $input_data, array_keys( $input_data ) ),
+				wp_array_slice_assoc( $data['value'], array_keys( $input_data ) )
+			);
 		}
 	}
 }
diff --git a/tests/php/test-class-wp-customize-postmeta-controller.php b/tests/php/test-class-wp-customize-postmeta-controller.php
index 621ded3..451c3bb 100644
--- a/tests/php/test-class-wp-customize-postmeta-controller.php
+++ b/tests/php/test-class-wp-customize-postmeta-controller.php
@@ -148,7 +148,6 @@ public function test_register_meta_without_theme_support() {
 		);
 		/** @var WP_Customize_Postmeta_Controller $stub */
 		$stub = $this->getMockForAbstractClass( 'WP_Customize_Postmeta_Controller', array( $args ) );
-		$this->assertEmpty( $this->wp_customize->posts->registered_post_meta );
 		$this->assertEquals( 0, $stub->register_meta( $this->wp_customize->posts ) );
 	}
 
@@ -167,7 +166,7 @@ public function test_register_meta_for_post_types() {
 		);
 		/** @var WP_Customize_Postmeta_Controller $stub */
 		$stub = $this->getMockForAbstractClass( 'WP_Customize_Postmeta_Controller', array( $args ) );
-		$this->assertEmpty( $customize_posts->registered_post_meta );
+		$customize_posts->registered_post_meta = array();
 		$this->assertEquals( count( $args['post_types'] ), $stub->register_meta( $this->wp_customize->posts ) );
 		$this->assertEquals( 10, has_filter( "sanitize_post_meta_{$args['meta_key']}", array( $stub, 'sanitize_value' ) ) );
 		$this->assertArrayHasKey( 'post', $customize_posts->registered_post_meta );
@@ -191,6 +190,7 @@ public function test_register_meta_for_post_type_supports() {
 		);
 		/** @var WP_Customize_Postmeta_Controller $stub */
 		$stub = $this->getMockForAbstractClass( 'WP_Customize_Postmeta_Controller', array( $args ) );
+		$customize_posts->registered_post_meta = array();
 		$this->assertEquals( count( get_post_types_by_support( 'page-attributes' ) ), $stub->register_meta( $this->wp_customize->posts ) );
 		$this->assertEquals( 10, has_filter( "sanitize_post_meta_{$args['meta_key']}", array( $stub, 'sanitize_value' ) ) );
 		$this->assertArrayNotHasKey( 'post', $customize_posts->registered_post_meta );
diff --git a/tests/php/test-class-wp-customize-posts.php b/tests/php/test-class-wp-customize-posts.php
index 29baadf..c292276 100644
--- a/tests/php/test-class-wp-customize-posts.php
+++ b/tests/php/test-class-wp-customize-posts.php
@@ -566,17 +566,29 @@ public function test_transition_customize_draft() {
 
 		$count = did_action( 'transition_post_status' );
 		$count = post_type_supports( 'customize_changeset', 'revisions' ) ? $count + 1 : $count;
-		wp_update_post( array( 'ID' => $changeset_post_id, 'post_status' => 'draft' ) );
+		wp_update_post( array(
+			'ID' => $changeset_post_id,
+			'post_status' => 'draft',
+		) );
 		$this->assertEquals( $count + 1, did_action( 'transition_post_status' ) );
 		$new_status = 'auto-draft';
 		$this->assertEquals( $new_status, get_post_status( $auto_draft_post->ID ) );
 		$this->assertEquals( $new_status, get_post_status( $auto_draft_page->ID ) );
-		$this->assertEquals( $new_status, get_post_status( $nav_menu_created_stub_post->ID ) );
+		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.9', '>=' ) ) {
+			$this->assertEquals( 'draft', get_post_status( $nav_menu_created_stub_post->ID ) );
+		} else {
+			$this->assertEquals( $new_status, get_post_status( $nav_menu_created_stub_post->ID ) );
+		}
 		$expected_year = date('Y') + 100;
 		$this->assertEquals( $expected_year, date( 'Y', strtotime( get_post( $auto_draft_post->ID )->post_date ) ) );
 		$this->assertEquals( $expected_year, date( 'Y', strtotime( get_post( $auto_draft_page->ID )->post_date ) ) );
-		$this->assertEquals( $expected_year, date( 'Y', strtotime( get_post( $nav_menu_created_stub_post->ID )->post_date ) ) );
-		wp_update_post( array( 'ID' => $changeset_post_id, 'post_status' => 'publish' ) );
+		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.9', '<' ) ) {
+			$this->assertEquals( $expected_year, date( 'Y', strtotime( get_post( $nav_menu_created_stub_post->ID )->post_date ) ) );
+		}
+		wp_update_post( array(
+			'ID' => $changeset_post_id,
+			'post_status' => 'publish',
+		) );
 		$this->assertEquals( 'publish', get_post_status( $auto_draft_post->ID ) );
 		$this->assertEquals( 'draft', get_post_status( $auto_draft_page->ID ) );
 		$this->assertEquals( 'publish', get_post_status( $nav_menu_created_stub_post->ID ) );
@@ -745,17 +757,18 @@ public function test_get_settings() {
 		wp_trash_post( $trashed_post_id );
 
 		$settings_params = $this->posts->get_settings( array( $published_post_id, $trashed_post_id, $draft_page_id, $nav_menu_item_id ) );
-		$this->assertEqualSets(
-			array(
-				WP_Customize_Post_Setting::get_post_setting_id( get_post( $published_post_id ) ),
-				WP_Customize_Post_Setting::get_post_setting_id( get_post( $trashed_post_id ) ),
-				WP_Customize_Post_Setting::get_post_setting_id( get_post( $draft_page_id ) ),
-				sprintf( 'nav_menu_item[%s]', $nav_menu_item_id ),
-				WP_Customize_Postmeta_Setting::get_post_meta_setting_id( get_post( $published_post_id ), 'baz' ),
-				WP_Customize_Postmeta_Setting::get_post_meta_setting_id( get_post( $trashed_post_id ), 'baz' )
-			),
-			array_keys( $settings_params )
+		$actual_setting_ids = array_keys( $settings_params );
+		$expected_setting_ids = array(
+			WP_Customize_Post_Setting::get_post_setting_id( get_post( $published_post_id ) ),
+			WP_Customize_Post_Setting::get_post_setting_id( get_post( $trashed_post_id ) ),
+			WP_Customize_Post_Setting::get_post_setting_id( get_post( $draft_page_id ) ),
+			sprintf( 'nav_menu_item[%s]', $nav_menu_item_id ),
+			WP_Customize_Postmeta_Setting::get_post_meta_setting_id( get_post( $published_post_id ), 'baz' ),
+			WP_Customize_Postmeta_Setting::get_post_meta_setting_id( get_post( $trashed_post_id ), 'baz' )
 		);
+		foreach ( $expected_setting_ids as $expected_setting_id ) {
+			$this->assertContains( $expected_setting_id, $actual_setting_ids );
+		}
 	}
 
 	/**