More content fixes
Merge branch 'master' of https://github.com/GoogleChrome/multi-device