Highlight on server when highlighting on client, for #12058

Change-Id: Ib109df81f4c56a7204ea01fd97162c323fcd3d3f