diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
index afd4038..737d2f0 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
@@ -327,13 +327,10 @@
         }
 
         @Override
-        public void onStart() {
-            super.onStart();
-            mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter);
-        }
-
-        @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
+            if (mMainFragmentAdapter.getFragmentHost() != null) {
+                mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter);
+            }
             setEntranceTransitionState(mEntranceTransitionState);
         }
 
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
index 02da218..1291a7f 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
@@ -330,6 +330,9 @@
 
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
+            if (mMainFragmentAdapter.getFragmentHost() != null) {
+                mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter);
+            }
             setEntranceTransitionState(mEntranceTransitionState);
         }
 
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
index f965b37..e1b01e1 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
@@ -48,6 +48,6 @@
     }
 
     public interface PictureInPictureListener {
-        void onPictureInPictureModeChanged(boolean isInPictureInPicture);
+        void onPictureInPictureModeChanged(boolean isInPictureInPictureMode);
     }
 }