resolve merge conflicts of a50a419b82 to ub-launcher3-master.

Change-Id: Ie0e233e22284b8ddd2dbb86204e042651b6dfae2

diff --cc src/com/android/launcher3/DeviceProfile.java
Simple merge

diff --cc src/com/android/launcher3/LauncherAppState.java
index 0a26109,430d193..ad959ef
--- 1/src/com/android/launcher3/LauncherAppState.java
--- 2/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@@ -108,16 -105,7 +109,16 @@@ public class LauncherAppState 
  
          sContext.registerReceiver(mModel, filter);
          UserManagerCompat.getInstance(sContext).enableAndResetCache();
- 
 +        if (!Utilities.ATLEAST_KITKAT) {
 +            sContext.registerReceiver(new BroadcastReceiver() {
 +
 +                @Override
 +                public void onReceive(Context context, Intent intent) {
 +                    mWallpaperChangedSinceLastCheck = true;
 +                }
 +            }, new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED));
 +        }
+         new ConfigMonitor(sContext).register();
      }
  
      /**