Merge "Fixed the ordering of colorized media notifications" into oc-dev