WIFI: Fix wimax teardown when wifi connected

Due to patch:
https://github.com/CyanogenMod/android_frameworks_base/commit/f769f4cbc2aaac8d9d49f9ff79a6fe0affc4ff6e

Change-Id: I18e5ced62c8e4976f7a6835ba8c593930dac0586
Global Settings (MSIM): Add global settings for naming sim cards

Change-Id: Ibbd0d48042a92f82241a4ccaee12a81ca13ccdb4
SystemUI: Fix crash during notification/theme change

Fixes crashing that could occur when a notification is created
during a theme change. Entries were attempting to be added
to views which did not have a layout pass yet, causing it to fail.

When a theme change occurs, the fix is to halt the ticker and command queue
until a layout occurs.

BUGDUMP-151925

Change-Id: Ic19d26178df673a1d52981a8617415e6fbcb219d
core: Improve strings

* Follow the guidelines

Change-Id: If4dbfe00036d65dc56b7852ec5ddbfbe72c921a0
keyguard: fix chopped layout on hdpi msim devices

* adapted from commit fa06992ab7e49fe1e056787dd281384d92290be1

Change-Id: I23ebb212c96e3ef8aecebb43760cbea7d441b1fd
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0