Revert "Force thumb and frameless images to default size in DM"

This reverts commit 80c7a28978cdf6935e666a79071fe62efbe89b78.

It contained conflict markers, oops!

Change-Id: I040533c15f874debed1f08096d4bd5f14cf38ae3