Merge changes I8cd9af52,I86a9f18a into udc-qpr-dev

* changes:
  Clear lock bitmaps when wallpaper applied to home+lock
  Strengthen Wallpaper clear logic