Merge "Rework thumbnail handling" into cm-10.2