NavBar: fix height not sticking on the values
Merge branch 'jb3' of https://github.com/CarbonDev/android_frameworks_base into jb3
Telephony: Introduce config item for Hot Swap support

When a Uicc Card is inserted or removed, Android pops up a prompt
to the user to reboot the device. This prompt is unnecessary if the
modem supports Hot Swapping of cards.

Introduce a new config item to indicate if the modem supports
hotswapping. Frameworks can then check this before propmting the
user.

Change-Id: I0f2c3134525aa2301fd667d0a1819f4419eecae0
Merge branch 'jb3' of https://github.com/CarbonDev/android_frameworks_base into jb3
Merge commit '9e144c7695d64e52b6b60e2013ac48824328ec1d' into jb3