Merge "[conflict] Merge "Re-revert "Move wallpaper local color extraction to background"" into tm-qpr-dev am: 24ec3157 am: f2b3028b" into udc-dev