Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev