CMFM: Fix more deadlocks

Change-Id: Iad7042126436c26f93f384358082d4fb0e780352
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
CMFM: Use centercrop for preview images

Change-Id: I7fc344cafb5a9580af868fd247effb4fa8d26f15
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge "CMFM: Use centercrop for preview images" into cm-11.0