Merge "screenrecord: fix race condition" into nyc-mr1-dev