Merge "Regularize some wallpaper APIs" into pi-dev