Rebase to cleaner looking traffic indicator [2/2]

Credit/Thanks to htchoi1995 and liquid0624

- http://i.imgur.com/3NzbfGc.png

Change-Id: I703cae1c07033eb88341953b20ae28a90b64e7a8
Merge "Rebase to cleaner looking traffic indicator [2/2]" into du44