am 0eee8ac2: Merge "Fix thumbnail bug"

* commit '0eee8ac275927264f766bb18023365e83d4bfe5a':
  Fix thumbnail bug