Merge "ConditionManager: don't crash when trying to add unexpected condition"