Bluetooth MAP (Message Access Profile) Upstream Changes
Hide lockscreen button options

This code has not been merged yet.
Fix lockscreen options
Update settings system menu
Merge remote-tracking branch 'upstream/jb42' into jb42