Merge "Add MediaRouter2 API atomic route callbacks"