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

Change-Id: I0c17b229ef4fec14cd3316b1b2cedd992e3e8ec4