SystemUI: Fix dock battery visual glitch

Hide dock battery views if device don't support dock battery status

Change-Id: If470e00a9afc2233865302bf3fa13367a77c6191
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Camera: add additional ISO modes (2/2)

Change-Id: I3460c3de4cbef467430673146a9ddb2fdc8f5032
Merge "Camera: add additional ISO modes (2/2)" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1-n7