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

Change-Id: I2dc9541d7f2122a5b5aac15de4680b2dea865b0c