[2.5] Change the cloak container from div to span

Ref #3953