frosty

diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift
index 04a9ac9..228c9d2 100644
--- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift
+++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift
@@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject {
             return
         }
 
-        let generator = UINotificationFeedbackGenerator()
+        notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator())

frosty

diff --git a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift
index 1ea4a35..03ec48c 100644
--- a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift
+++ b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift
@@ -98,6 +98,14 @@ class WPSplitViewController: UISplitViewController {
         return UITraitCollection(traitsFromCollections: [collection, overrideCollection])
     }
 
+    override func viewWillAppear(animated: Bool) {
+        super.viewWillAppear(animated)

frosty

diff --git a/Pod/Classes/WPFullScreenAssetPreviewViewController.m b/Pod/Classes/WPFullScreenAssetPreviewViewController.m
index 3765e0c..8ad225d 100644
--- a/Pod/Classes/WPFullScreenAssetPreviewViewController.m
+++ b/Pod/Classes/WPFullScreenAssetPreviewViewController.m
@@ -143,4 +143,9 @@ - (void)handleTapOnAsset:(UIGestureRecognizer *)gestureRecognizer
     }
 }
 
+- (CGSize)preferredContentSize
+{

frosty

diff --git a/Pod/Classes/WPMediaPickerViewController.m b/Pod/Classes/WPMediaPickerViewController.m
index 0c90262..821b457 100644
--- a/Pod/Classes/WPMediaPickerViewController.m
+++ b/Pod/Classes/WPMediaPickerViewController.m
@@ -659,11 +659,12 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker
 
 - (void)setGroup:(id<WPMediaGroup>)group {
     if (group == [self.dataSource selectedGroup]){
-        [self dismissViewControllerAnimated:YES completion:nil];
         return;

frosty

diff --git a/Pod/Classes/WPVideoPlayerView.m b/Pod/Classes/WPVideoPlayerView.m
index 6da5424..4ed3fa2 100644
--- a/Pod/Classes/WPVideoPlayerView.m
+++ b/Pod/Classes/WPVideoPlayerView.m
@@ -12,6 +12,7 @@ @interface WPVideoPlayerView()
 @property (nonatomic, strong) AVPlayerItem *playerItem;
 @property (nonatomic, strong) UIToolbar *controlToolbar;
 @property (nonatomic, strong) UIBarButtonItem * videoDurationButton;
+@property (nonatomic, strong) UILabel * videoDurationLabel;
 @property (nonatomic, strong) id timeObserver;

frosty

diff --git a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift
index afea6d00d..ee190bf8e 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift
+++ b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift
@@ -514,7 +514,26 @@ extension NotificationsViewController {
             return
         }
 
-        performSegue(withIdentifier: NotificationDetailsViewController.classNameWithoutNamespaces(), sender: note)
+        if let controller = storyboard?.instantiateViewController(withIdentifier: "NotificationDetailsViewController") as? NotificationDetailsViewController {

frosty

diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h
index fedb7b7a8..783eab04e 100644
--- a/WordPress/Classes/Services/MediaService.h
+++ b/WordPress/Classes/Services/MediaService.h
@@ -40,6 +40,11 @@
            thumbnailCallback:(nullable void (^)(NSURL * _Nonnull thumbnailURL))thumbnailCallback
                   completion:(nullable void (^)(Media * _Nullable media, NSError * _Nullable error))completion;
 
+- (void)createMediaWithPHAsset:(nonnull PHAsset *)asset
+               forBlogObjectID:(nonnull NSManagedObjectID *)blogObjectID

frosty

diff --git a/Example/WPMediaPicker/DemoViewController.m b/Example/WPMediaPicker/DemoViewController.m
index 9140fb5..d6b7c3c 100644
--- a/Example/WPMediaPicker/DemoViewController.m
+++ b/Example/WPMediaPicker/DemoViewController.m
@@ -275,6 +275,7 @@ - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
 {
     if (textField == self.quickInputTextField) {
         [self setupMediaKeyboardForInputField];
+        self.mediaInputViewController.options = [self selectedOptions]; 
         [self.mediaInputViewController.mediaPicker resetState:NO];

frosty

diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m b/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m
index 87e745150..cb127b4bb 100644
--- a/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m
+++ b/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m
@@ -11,7 +11,7 @@ @interface BlogDetailHeaderView () <UIDropInteractionDelegate>
 @property (nonatomic, strong) UIStackView *stackView;
 @property (nonatomic, strong) UIActivityIndicatorView *blavatarUpdateActivityIndicatorView;
 @property (nonatomic, strong) UIStackView *labelsStackView;
-@property (nonatomic) BOOL isAnimating;
+@property (nonatomic, strong) UIView *blavatarDropTarget;

frosty

diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift
index e0029787..6f9b2ca9 100644
--- a/Example/Example/EditorDemoController.swift
+++ b/Example/Example/EditorDemoController.swift
@@ -464,6 +464,17 @@ extension EditorDemoController : UITextViewDelegate {
         }
     }
 
+    func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        // If the user types a tab character in the title text view,