Merge "Fix PlaybackOverlayFragment sample not work." into nyc-support-25.1-dev