Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb