Merge "Fixing the colorization of legacy media notifications" into oc-dev