Merge "Type registry helper: Toolkit change to correct Programming Guide for Custom...