Merge "Add missing SPEAKER_SAFE device in DEVICE_CATEGORY_SPEAKER"