Merge "More lenient on playback start" into nyc-dev