Refactoring to better support mixed wallpaper sources

Change-Id: I3b47a8f56d418c6f2e7b9fd469427c3056def8d8
5 files changed