Merge "Add final to MediaRouter2" into rvc-dev