Merge "Add more device codes for symbolic display" into mnc-dev