SoundSettings: Assigning a null to an unnecessary variable

Change-Id: Ic8c3e6ff66cc888f6069e3bbef666ede3c56dc13
Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into cm-11.0