Merge "Copy support MediaRouter code"