Merge "Add controls for ALLM and Content Types to composer hal"