Fix to avoid IE "compatibility view"

Bug: 25378
Bug: 49548
Bug: 54343
Change-Id: I1e94128e8578e3ac3ab7a64bbc0431a454085d02
Merge "Fix to avoid IE "compatibility view""