Merge "Added support for media notifications without expanded state" into nyc-dev