Merge "Set minLines for battery header text" into oc-dr1-dev