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

* commit '909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14':
  Fix thumbnail bug