Merge "MediaRouter: Add more logs for debugging" into nyc-dev