Development to master merge.

In advance it's more evident to use INTENT_COLOR name. TAG is usually used for Log.x(...)