Merge "Fix for NPE in PlaybackOverlayFragment (sample app)."