Merge "Cleanup createTrack error handling"