Merge "Fix scan request leak in RouterInfoMediaManager" into main