Merge "lower the importance of codec used for thumbnail" into main