Merge "Fixed the ordering of colorized media notifications" into oc-dev am: 37079af46d
am: 536eb852eb

Change-Id: I146e53c3ac3404f75909a564d62e905a4ca70a10