Merge "Skip frames with no damage" into mnc-dev