fw: media: Handle NPE due to threading race

Change-Id: I6eab5bc3d687edfa6f0839e439b3314bed4fdcea
Merge "fw: media: Handle NPE due to threading race" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0