Merge "Added the ripple drawable back to the media notification" into nyc-dev