Merge "Fix start time modification outside of updatePlayTime()"