Merge "Revamp classic edit toolbar not to hardcode paths in HTML"