Update MultimediaViewer to head of wmf/1.23wmf21 branch

Change-Id: I69577c7076c63b7ac1670c43d408d2dad2855e51