CMS-1295: Live Edit: Too slow "fade in move" icon
Merge remote branch 'origin/master'