Traffic meter re-organization in settings display

Change-Id: I3db6a47bc6efed6e4391c8156213e83a3623a16e