Merge "Fix kSkippedFrame setting" into mnc-dev