various

Change-Id: I9dcf8d88266a2801bdaa0503eb9235b98cd5eb78
Merge branch 'ska43' of https://github.com/SofaKingAndroid/frameworks_base into ska43

Conflicts:
	packages/SystemUI/res/values/dimens.xml

Change-Id: If200d54b8b8affe98845eb30bd58ecb5f6848b0f