Revert "Exclude empty and custom screens when centering wallpaper"

This reverts commit f7bef2545ba45e8405dd5a00c0d276d669bf0ad0.

Change-Id: Iee25ecd12eb5b7be9f14959336af6c6c49d88c25
Revert "Center wallpaper when only one screen"

This reverts commit eacfd7fd535b4510cc43400c145c46db10110d08.

Change-Id: I85fac84069cc10ad0c537104927af6bbe4be51f4
Merge branch into kk_mkt