Merge "Cleans up effects handling for live wallpapers" into udc-qpr-dev