Merge changes I7f7a9842,I4c74b269

* changes:
  Implement new thumbnail loading strategy
  Also store reduced resolution screenshots