Merge "SystemUI: don't crash when user disable default apps" into cm-11.0
Revert "Rollback Bluetooth changes for now."

This reverts commit abf66847cc824ac09aef80ba3d0059c8fafad865.

Change-Id: Ib3c2317e159c9b3bdba5fdcb02aeaf2683f883b5
Merge "Forward port CM Screen Security settings (1/2)" into cm-11.0
Revert "Revert "Rollback Bluetooth changes for now.""

  * Still causing too many problems. Going to back off from this until
    device maintainers check off on it.

This reverts commit 5e2d55e73b294a2f82f76aedc7a49df05641f305.
Merge branch 'upstream/cm-11.0'