Merge "Fix endless boot-loop on ldpi, when using bg-color/image on lockscreen" into gingerbread