Merge "Media notifications now properly respect font size changes" into nyc-dev