Merge branch 'master' into mailcoreUpdate

Pods/Onboard/Source/OnboardingContentViewController.m

@@ -320,6 +320,13 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
         self.moviePlayerController = [AVPlayerViewController new];
         self.moviePlayerController.player = self.player;
         self.moviePlayerController.showsPlaybackControls = NO;
+        
+        self.moviePlayerController.player.actionAtItemEnd = AVPlayerActionAtItemEndNone;
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(playerItemDidReachEnd:)
+                                                     name:AVPlayerItemDidPlayToEndTimeNotification
+                                                   object:[self.moviePlayerController.player currentItem]];
 
         [self.view addSubview:self.moviePlayerController.view];
     }
@@ -422,7 +429,7 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
     
     if (!self.onlyInputView) {
         if (self.videoURL) {
-            self.moviePlayerController.view.frame = self.view.frame;
+            self.moviePlayerController.view.frame = self.inputView.frame;//self.view.frame;
         }
 
         CGFloat viewWidth = CGRectGetWidth(self.view.frame);
@@ -498,4 +505,9 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
     }
 }
 
+- (void)playerItemDidReachEnd:(NSNotification *)notification {
+    AVPlayerItem *p = [notification object];
+    [p seekToTime:kCMTimeZero];
+}
+
 @end