Backport critical Media Viewer bugfixes

Bug: 72516
Bug: 73337
Change-Id: I73903ddaf04ae80794acc18ea47d11b5d455bb96
Merge "Backport critical Media Viewer bugfixes" into wmf/1.25wmf8