Merge "Don't crash on unknown CDM profile name" into sc-dev