Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread