Show volume rocker wake option in Display settings

Change-Id: I3f56acdd1cd36a58ebd72d525ba7fba9d6522f88
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_samsung_crespo into cm-10.1