Merge "Fix issues #5233826 and #5209847 -- live wallpapers."