Merge "Avoid setting mCurFrame to -1" into mnc-dev