bugid:68736 putting video placeholder messages back in place
Merge branch 'messages-for-video-placeholder' into dev