Merge "Quit using weightChildNode for ADDITIONAL_PROXIMITY and SUBSTITUTION."