Merge "Disable skipping frames on empty damage" into mnc-dev