Don't show custom lockscreen wallpaper when album art is showing
Merge branch 'kitkat' of https://github.com/GravityBox/GravityBox.git into kitkat