am 26daa02b: Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"

* commit '26daa02bdb0c62f8162ad8d4d771cabce8644b4a':
  Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation