Merge changes I86f597f1,I5c9c09dd

* changes:
  MediaStore deprecations for Q.
  Convenience method for obtaining thumbnails.