Post-merge conflict fixes.
Allow toggling wifi or bluetooth via lockscreen gesture or long key
press.