Video wallpaper mode changes
Merge branch 'dev'