Merge "frameworks/base: Fix for the race in Wallpaperservice" into kitkat