Merge "Fix helper_invocation.* rendering mostly black." into mnc-dev