Merge "Add support for custom media notifications" into nyc-dev