Merge "Quick: Avoid unnecessary GVN work in release builds." into mnc-dev