d9939f4d755911d13fbe5e6a6b9cbabc62f0984b Merge "Rework thumbnail handling" into jellybean