Merge "Reorder device category" into mnc-dev