Merge "Fix numbering in API Demos"