Merge "Add Settings Panels proto enums"