Merge "Add missing wallpaper service lock." into gingerbread