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

Change-Id: I1b3c6f23ed2dc8a0e5cb28badd53766b0d30a3ba