am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug"

* commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
  Fix thumbnail bug