Merge "Fix CustomDescription so it allows multiple transformations per view id." into oc-mr1-dev