Merge "Fix framestats docs ordering" into mnc-preview-docs