Reorder metrics

Image-specific metrics should always appear at the top

Change-Id: I8d8d5b5b6c7a62de32d175cd593a47aaa0d5ec9d