Merge "DockBatteryMeter: Avoid double detach when view is rebuilt" into cm-11.0