Merge "Add media.log to Watchdog stacks" into nyc-dev