Merge "Add a new API to let media routes have visibility restricted by permissions" into main