Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-dev