Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Option to disable inline content previews. (#528)
Merge pull request #529 from dosiecki/master

Android: Option to disable inline content previews