Merge "Add BottomLabelLayout for battery graph" into oc-dev