Merge "Add EXTRA_START_PLAYBACK" into nyc-support-25.4-dev